OpenJDK / jdk / jdk12
changeset 48064:390794d000e6
8193055: ADD_JVM_ARG_IF_OK always fails
Reviewed-by: dholmes
| author | ihse |
|---|---|
| date | Tue, 05 Dec 2017 14:10:11 +0100 |
| parents | 50d61f4b5d1a |
| children | c4f2b6749c86 |
| files | make/autoconf/boot-jdk.m4 make/autoconf/generated-configure.sh |
| diffstat | 2 files changed, 1 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/make/autoconf/boot-jdk.m4 Tue Nov 21 17:39:04 2017 +0100 +++ b/make/autoconf/boot-jdk.m4 Tue Dec 05 14:10:11 2017 +0100 @@ -353,9 +353,6 @@ AC_MSG_CHECKING([flags for boot jdk java command] ) - # Disable special log output when a debug build is used as Boot JDK... - ADD_JVM_ARG_IF_OK([-XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput],boot_jdk_jvmargs,[$JAVA]) - # Force en-US environment ADD_JVM_ARG_IF_OK([-Duser.language=en -Duser.country=US],boot_jdk_jvmargs,[$JAVA])
--- a/make/autoconf/generated-configure.sh Tue Nov 21 17:39:04 2017 +0100 +++ b/make/autoconf/generated-configure.sh Tue Dec 05 14:10:11 2017 +0100 @@ -5159,7 +5159,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1512410983 +DATE_WHEN_GENERATED=1512479382 ############################################################################### # @@ -67379,23 +67379,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking flags for boot jdk java command " >&5 $as_echo_n "checking flags for boot jdk java command ... " >&6; } - # Disable special log output when a debug build is used as Boot JDK... - - $ECHO "Check if jvm arg is ok: -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput" >&5 - $ECHO "Command: $JAVA -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput -version" >&5 - OUTPUT=`$JAVA -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput -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 - boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput" - JVM_ARG_OK=true - else - $ECHO "Arg failed:" >&5 - $ECHO "$OUTPUT" >&5 - JVM_ARG_OK=false - fi - - # Force en-US environment $ECHO "Check if jvm arg is ok: -Duser.language=en -Duser.country=US" >&5