OpenJDK / jdk / jdk10
changeset 39720:e2cdfe8818e1
Merge
| author | duke |
|---|---|
| date | Wed, 05 Jul 2017 21:58:58 +0200 |
| parents | 3b5633fa6073 ed24939e8679 |
| children | f82e2e9ec030 |
| files | |
| diffstat | 3 files changed, 22 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags-top-repo Thu Jul 21 21:42:16 2016 +0000 +++ b/.hgtags-top-repo Wed Jul 05 21:58:58 2017 +0200 @@ -370,3 +370,4 @@ 9aa7d40f3a453f51e47f4c1b19eff5740a74a9f8 jdk-9+125 3a58466296d36944454756ef01e7513ac5e14a16 jdk-9+126 8fa686245bd2a072ece3392743460030f0854520 jdk-9+127 +b30ae794d974d7dd3eb4e84203f70021823fa6c6 jdk-9+128
--- a/common/autoconf/boot-jdk.m4 Thu Jul 21 21:42:16 2016 +0000 +++ b/common/autoconf/boot-jdk.m4 Wed Jul 05 21:58:58 2017 +0200 @@ -345,6 +345,9 @@ # 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]) + # Apply user provided options. ADD_JVM_ARG_IF_OK([$with_boot_jdk_jvmargs],boot_jdk_jvmargs,[$JAVA])
--- a/common/autoconf/generated-configure.sh Thu Jul 21 21:42:16 2016 +0000 +++ b/common/autoconf/generated-configure.sh Wed Jul 05 21:58:58 2017 +0200 @@ -5094,7 +5094,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1467960715 +DATE_WHEN_GENERATED=1469202305 ############################################################################### # @@ -65048,6 +65048,23 @@ fi + # Force en-US environment + + $ECHO "Check if jvm arg is ok: -Duser.language=en -Duser.country=US" >&5 + $ECHO "Command: $JAVA -Duser.language=en -Duser.country=US -version" >&5 + OUTPUT=`$JAVA -Duser.language=en -Duser.country=US -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 -Duser.language=en -Duser.country=US" + JVM_ARG_OK=true + else + $ECHO "Arg failed:" >&5 + $ECHO "$OUTPUT" >&5 + JVM_ARG_OK=false + fi + + # Apply user provided options. $ECHO "Check if jvm arg is ok: $with_boot_jdk_jvmargs" >&5