make/autoconf/boot-jdk.m4

*** 61,82 ****
      $1
  
      # If previous step claimed to have found a JDK, check it to see if it seems to be valid.
      if test "x$BOOT_JDK_FOUND" = xmaybe; then
        # Do we have a bin/java?
!       if test ! -x "$BOOT_JDK/bin/java"; then
          AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring])
          BOOT_JDK_FOUND=no
        else
          # Do we have a bin/javac?
!         if test ! -x "$BOOT_JDK/bin/javac"; then
            AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring])
            AC_MSG_NOTICE([(This might be an JRE instead of an JDK)])
            BOOT_JDK_FOUND=no
          else
            # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
!           BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" $USER_BOOT_JDK_OPTIONS -version 2>&1 | $HEAD -n 1`
            if [ [[ "$BOOT_JDK_VERSION" =~ "Picked up" ]] ]; then
              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.])
              AC_MSG_NOTICE([Java reports: "$BOOT_JDK_VERSION".])
              AC_MSG_ERROR([Cannot continue])
            fi
--- 61,82 ----
      $1
  
      # If previous step claimed to have found a JDK, check it to see if it seems to be valid.
      if test "x$BOOT_JDK_FOUND" = xmaybe; then
        # Do we have a bin/java?
!       if test ! -x "$BOOT_JDK/bin/java$EXECUTABLE_SUFFIX"; then
          AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring])
          BOOT_JDK_FOUND=no
        else
          # Do we have a bin/javac?
!         if test ! -x "$BOOT_JDK/bin/javac$EXECUTABLE_SUFFIX"; then
            AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring])
            AC_MSG_NOTICE([(This might be an JRE instead of an JDK)])
            BOOT_JDK_FOUND=no
          else
            # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
!           BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java$EXECUTABLE_SUFFIX" $USER_BOOT_JDK_OPTIONS -version 2>&1 | $HEAD -n 1`
            if [ [[ "$BOOT_JDK_VERSION" =~ "Picked up" ]] ]; then
              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.])
              AC_MSG_NOTICE([Java reports: "$BOOT_JDK_VERSION".])
              AC_MSG_ERROR([Cannot continue])
            fi
*** 99,109 ****
              BOOT_JDK_FOUND=yes
              BASIC_FIXUP_PATH(BOOT_JDK)
              AC_MSG_CHECKING([for Boot JDK])
              AC_MSG_RESULT([$BOOT_JDK])
              AC_MSG_CHECKING([Boot JDK version])
!             BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" $USER_BOOT_JDK_OPTIONS -version 2>&1 | $TR '\n\r' '  '`
              AC_MSG_RESULT([$BOOT_JDK_VERSION])
            fi # end check jdk version
          fi # end check javac
        fi # end check java
      fi # end check boot jdk found
--- 99,109 ----
              BOOT_JDK_FOUND=yes
              BASIC_FIXUP_PATH(BOOT_JDK)
              AC_MSG_CHECKING([for Boot JDK])
              AC_MSG_RESULT([$BOOT_JDK])
              AC_MSG_CHECKING([Boot JDK version])
!             BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java$EXECUTABLE_SUFFIX" $USER_BOOT_JDK_OPTIONS -version 2>&1 | $TR '\n\r' '  '`
              AC_MSG_RESULT([$BOOT_JDK_VERSION])
            fi # end check jdk version
          fi # end check javac
        fi # end check java
      fi # end check boot jdk found
*** 333,347 ****
    fi
  
    AC_SUBST(BOOT_JDK)
  
    # Setup tools from the Boot JDK.
!   BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVA, java)
!   BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAC, javac)
!   BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVADOC, javadoc)
!   BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAR, jar)
!   BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JARSIGNER, jarsigner)
  
    # Finally, set some other options...
  
    # When compiling code to be executed by the Boot JDK, force compatibility with the
    # oldest supported bootjdk.
--- 333,347 ----
    fi
  
    AC_SUBST(BOOT_JDK)
  
    # Setup tools from the Boot JDK.
!   BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVA, java$EXECUTABLE_SUFFIX)
!   BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAC, javac$EXECUTABLE_SUFFIX)
!   BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVADOC, javadoc$EXECUTABLE_SUFFIX)
!   BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAR, jar$EXECUTABLE_SUFFIX)
!   BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JARSIGNER, jarsigner$EXECUTABLE_SUFFIX)
  
    # Finally, set some other options...
  
    # When compiling code to be executed by the Boot JDK, force compatibility with the
    # oldest supported bootjdk.