OpenJDK / jdk / hs
changeset 42852:3411570543b8
8171859: Configure check for modular boot jdk needs to be updated
Reviewed-by: mchung
| author | erikj |
|---|---|
| date | Tue, 27 Dec 2016 09:42:16 +0100 |
| parents | 72e5b4fb1e1b |
| children | 670162543c5d |
| files | common/autoconf/boot-jdk.m4 common/autoconf/generated-configure.sh |
| diffstat | 2 files changed, 3 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/boot-jdk.m4 Fri Dec 23 13:43:21 2016 -0800 +++ b/common/autoconf/boot-jdk.m4 Tue Dec 27 09:42:16 2016 +0100 @@ -305,9 +305,8 @@ BOOT_JDK_SOURCETARGET="-source 8 -target 8" AC_SUBST(BOOT_JDK_SOURCETARGET) - ADD_JVM_ARG_IF_OK([--patch-module foo=bar], dummy, [$JAVA]) AC_MSG_CHECKING([if Boot JDK supports modules]) - if test "x$JVM_ARG_OK" = "xtrue"; then + if "$JAVA" --list-modules > /dev/null 2>&1; then AC_MSG_RESULT([yes]) BOOT_JDK_MODULAR="true" else
--- a/common/autoconf/generated-configure.sh Fri Dec 23 13:43:21 2016 -0800 +++ b/common/autoconf/generated-configure.sh Tue Dec 27 09:42:16 2016 +0100 @@ -5170,7 +5170,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1482309967 +DATE_WHEN_GENERATED=1482828098 ############################################################################### # @@ -30665,24 +30665,9 @@ BOOT_JDK_SOURCETARGET="-source 8 -target 8" - - $ECHO "Check if jvm arg is ok: --patch-module foo=bar" >&5 - $ECHO "Command: $JAVA --patch-module foo=bar -version" >&5 - OUTPUT=`$JAVA --patch-module foo=bar -version 2>&1` - FOUND_WARN=`$ECHO "$OUTPUT" | $GREP -i warn` - FOUND_VERSION=`$ECHO $OUTPUT | $GREP " version \""` - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then - dummy="$dummy --patch-module foo=bar" - JVM_ARG_OK=true - else - $ECHO "Arg failed:" >&5 - $ECHO "$OUTPUT" >&5 - JVM_ARG_OK=false - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Boot JDK supports modules" >&5 $as_echo_n "checking if Boot JDK supports modules... " >&6; } - if test "x$JVM_ARG_OK" = "xtrue"; then + if "$JAVA" --list-modules > /dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } BOOT_JDK_MODULAR="true"