equal
deleted
inserted
replaced
5157 # definitions. It is replaced with custom functionality when building |
5157 # definitions. It is replaced with custom functionality when building |
5158 # custom sources. |
5158 # custom sources. |
5159 #CUSTOM_AUTOCONF_INCLUDE |
5159 #CUSTOM_AUTOCONF_INCLUDE |
5160 |
5160 |
5161 # Do not change or remove the following line, it is needed for consistency checks: |
5161 # Do not change or remove the following line, it is needed for consistency checks: |
5162 DATE_WHEN_GENERATED=1512410983 |
5162 DATE_WHEN_GENERATED=1512566251 |
5163 |
5163 |
5164 ############################################################################### |
5164 ############################################################################### |
5165 # |
5165 # |
5166 # Initialization / Boot-strapping |
5166 # Initialization / Boot-strapping |
5167 # |
5167 # |
67377 |
67377 |
67378 |
67378 |
67379 { $as_echo "$as_me:${as_lineno-$LINENO}: checking flags for boot jdk java command " >&5 |
67379 { $as_echo "$as_me:${as_lineno-$LINENO}: checking flags for boot jdk java command " >&5 |
67380 $as_echo_n "checking flags for boot jdk java command ... " >&6; } |
67380 $as_echo_n "checking flags for boot jdk java command ... " >&6; } |
67381 |
67381 |
67382 # Disable special log output when a debug build is used as Boot JDK... |
|
67383 |
|
67384 $ECHO "Check if jvm arg is ok: -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput" >&5 |
|
67385 $ECHO "Command: $JAVA -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput -version" >&5 |
|
67386 OUTPUT=`$JAVA -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput -version 2>&1` |
|
67387 FOUND_WARN=`$ECHO "$OUTPUT" | $GREP -i warn` |
|
67388 FOUND_VERSION=`$ECHO $OUTPUT | $GREP " version \""` |
|
67389 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then |
|
67390 boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput" |
|
67391 JVM_ARG_OK=true |
|
67392 else |
|
67393 $ECHO "Arg failed:" >&5 |
|
67394 $ECHO "$OUTPUT" >&5 |
|
67395 JVM_ARG_OK=false |
|
67396 fi |
|
67397 |
|
67398 |
|
67399 # Force en-US environment |
67382 # Force en-US environment |
67400 |
67383 |
67401 $ECHO "Check if jvm arg is ok: -Duser.language=en -Duser.country=US" >&5 |
67384 $ECHO "Check if jvm arg is ok: -Duser.language=en -Duser.country=US" >&5 |
67402 $ECHO "Command: $JAVA -Duser.language=en -Duser.country=US -version" >&5 |
67385 $ECHO "Command: $JAVA -Duser.language=en -Duser.country=US -version" >&5 |
67403 OUTPUT=`$JAVA -Duser.language=en -Duser.country=US -version 2>&1` |
67386 OUTPUT=`$JAVA -Duser.language=en -Duser.country=US -version 2>&1` |