comparison make/autoconf/boot-jdk.m4 @ 57834:00d9f8de0e3d

Automatic merge with records-and-sealed
author mcimadamore
date Thu, 19 Sep 2019 15:47:00 +0000
parents 28094715ae71
children 0b9bce7e9ae4 20dfe7974cc2
comparison
equal deleted inserted replaced
22:817f7955c6c3 23:5c3e6c2d5579
61 $1 61 $1
62 62
63 # If previous step claimed to have found a JDK, check it to see if it seems to be valid. 63 # If previous step claimed to have found a JDK, check it to see if it seems to be valid.
64 if test "x$BOOT_JDK_FOUND" = xmaybe; then 64 if test "x$BOOT_JDK_FOUND" = xmaybe; then
65 # Do we have a bin/java? 65 # Do we have a bin/java?
66 if test ! -x "$BOOT_JDK/bin/java"; then 66 if test ! -x "$BOOT_JDK/bin/java$EXE_SUFFIX"; then
67 AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring]) 67 AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring])
68 BOOT_JDK_FOUND=no 68 BOOT_JDK_FOUND=no
69 else 69 else
70 # Do we have a bin/javac? 70 # Do we have a bin/javac?
71 if test ! -x "$BOOT_JDK/bin/javac"; then 71 if test ! -x "$BOOT_JDK/bin/javac$EXE_SUFFIX"; then
72 AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring]) 72 AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring])
73 AC_MSG_NOTICE([(This might be an JRE instead of an JDK)]) 73 AC_MSG_NOTICE([(This might be an JRE instead of an JDK)])
74 BOOT_JDK_FOUND=no 74 BOOT_JDK_FOUND=no
75 else 75 else
76 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 76 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
77 BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" $USER_BOOT_JDK_OPTIONS -version 2>&1 | $HEAD -n 1` 77 BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java$EXE_SUFFIX" $USER_BOOT_JDK_OPTIONS -version 2>&1 | $HEAD -n 1`
78 if [ [[ "$BOOT_JDK_VERSION" =~ "Picked up" ]] ]; then 78 if [ [[ "$BOOT_JDK_VERSION" =~ "Picked up" ]] ]; then
79 AC_MSG_NOTICE([You have _JAVA_OPTIONS or JAVA_TOOL_OPTIONS set. This can mess up the build. Please use --with-boot-jdk-jvmargs instead.]) 79 AC_MSG_NOTICE([You have _JAVA_OPTIONS or JAVA_TOOL_OPTIONS set. This can mess up the build. Please use --with-boot-jdk-jvmargs instead.])
80 AC_MSG_NOTICE([Java reports: "$BOOT_JDK_VERSION".]) 80 AC_MSG_NOTICE([Java reports: "$BOOT_JDK_VERSION".])
81 AC_MSG_ERROR([Cannot continue]) 81 AC_MSG_ERROR([Cannot continue])
82 fi 82 fi
99 BOOT_JDK_FOUND=yes 99 BOOT_JDK_FOUND=yes
100 BASIC_FIXUP_PATH(BOOT_JDK) 100 BASIC_FIXUP_PATH(BOOT_JDK)
101 AC_MSG_CHECKING([for Boot JDK]) 101 AC_MSG_CHECKING([for Boot JDK])
102 AC_MSG_RESULT([$BOOT_JDK]) 102 AC_MSG_RESULT([$BOOT_JDK])
103 AC_MSG_CHECKING([Boot JDK version]) 103 AC_MSG_CHECKING([Boot JDK version])
104 BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" $USER_BOOT_JDK_OPTIONS -version 2>&1 | $TR '\n\r' ' '` 104 BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java$EXE_SUFFIX" $USER_BOOT_JDK_OPTIONS -version 2>&1 | $TR '\n\r' ' '`
105 AC_MSG_RESULT([$BOOT_JDK_VERSION]) 105 AC_MSG_RESULT([$BOOT_JDK_VERSION])
106 fi # end check jdk version 106 fi # end check jdk version
107 fi # end check javac 107 fi # end check javac
108 fi # end check java 108 fi # end check java
109 fi # end check boot jdk found 109 fi # end check boot jdk found
333 fi 333 fi
334 334
335 AC_SUBST(BOOT_JDK) 335 AC_SUBST(BOOT_JDK)
336 336
337 # Setup tools from the Boot JDK. 337 # Setup tools from the Boot JDK.
338 BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVA, java) 338 BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVA, java$EXE_SUFFIX)
339 BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAC, javac) 339 BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAC, javac$EXE_SUFFIX)
340 BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVADOC, javadoc) 340 BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVADOC, javadoc$EXE_SUFFIX)
341 BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAR, jar) 341 BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAR, jar$EXE_SUFFIX)
342 BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JARSIGNER, jarsigner) 342 BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JARSIGNER, jarsigner$EXE_SUFFIX)
343 343
344 # Finally, set some other options... 344 # Finally, set some other options...
345 345
346 # When compiling code to be executed by the Boot JDK, force compatibility with the 346 # When compiling code to be executed by the Boot JDK, force compatibility with the
347 # oldest supported bootjdk. 347 # oldest supported bootjdk.