equal
deleted
inserted
replaced
4948 # definitions. It is replaced with custom functionality when building |
4948 # definitions. It is replaced with custom functionality when building |
4949 # custom sources. |
4949 # custom sources. |
4950 #CUSTOM_AUTOCONF_INCLUDE |
4950 #CUSTOM_AUTOCONF_INCLUDE |
4951 |
4951 |
4952 # Do not change or remove the following line, it is needed for consistency checks: |
4952 # Do not change or remove the following line, it is needed for consistency checks: |
4953 DATE_WHEN_GENERATED=1458755892 |
4953 DATE_WHEN_GENERATED=1460464859 |
4954 |
4954 |
4955 ############################################################################### |
4955 ############################################################################### |
4956 # |
4956 # |
4957 # Initialization / Boot-strapping |
4957 # Initialization / Boot-strapping |
4958 # |
4958 # |
29768 # When compiling code to be executed by the Boot JDK, force jdk8 compatibility. |
29768 # When compiling code to be executed by the Boot JDK, force jdk8 compatibility. |
29769 BOOT_JDK_SOURCETARGET="-source 8 -target 8" |
29769 BOOT_JDK_SOURCETARGET="-source 8 -target 8" |
29770 |
29770 |
29771 |
29771 |
29772 |
29772 |
29773 $ECHO "Check if jvm arg is ok: -Xpatch:" >&5 |
29773 $ECHO "Check if jvm arg is ok: -Xpatch:foo=bar" >&5 |
29774 $ECHO "Command: $JAVA -Xpatch: -version" >&5 |
29774 $ECHO "Command: $JAVA -Xpatch:foo=bar -version" >&5 |
29775 OUTPUT=`$JAVA -Xpatch: -version 2>&1` |
29775 OUTPUT=`$JAVA -Xpatch:foo=bar -version 2>&1` |
29776 FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` |
29776 FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` |
29777 FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` |
29777 FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` |
29778 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then |
29778 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then |
29779 dummy="$dummy -Xpatch:" |
29779 dummy="$dummy -Xpatch:foo=bar" |
29780 JVM_ARG_OK=true |
29780 JVM_ARG_OK=true |
29781 else |
29781 else |
29782 $ECHO "Arg failed:" >&5 |
29782 $ECHO "Arg failed:" >&5 |
29783 $ECHO "$OUTPUT" >&5 |
29783 $ECHO "$OUTPUT" >&5 |
29784 JVM_ARG_OK=false |
29784 JVM_ARG_OK=false |
29854 else |
29854 else |
29855 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? |
29855 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? |
29856 BUILD_JDK_VERSION=`"$BUILD_JDK/bin/java" -version 2>&1 | head -n 1` |
29856 BUILD_JDK_VERSION=`"$BUILD_JDK/bin/java" -version 2>&1 | head -n 1` |
29857 |
29857 |
29858 # Extra M4 quote needed to protect [] in grep expression. |
29858 # Extra M4 quote needed to protect [] in grep expression. |
29859 FOUND_CORRECT_VERSION=`echo $BUILD_JDK_VERSION | grep '\"1\.[9]\.'` |
29859 FOUND_CORRECT_VERSION=`echo $BUILD_JDK_VERSION | $EGREP '\"9([\.+-].*)?\"'` |
29860 if test "x$FOUND_CORRECT_VERSION" = x; then |
29860 if test "x$FOUND_CORRECT_VERSION" = x; then |
29861 { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BUILD_JDK is incorrect JDK version ($BUILD_JDK_VERSION); ignoring" >&5 |
29861 { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Build JDK found at $BUILD_JDK is incorrect JDK version ($BUILD_JDK_VERSION); ignoring" >&5 |
29862 $as_echo "$as_me: Potential Boot JDK found at $BUILD_JDK is incorrect JDK version ($BUILD_JDK_VERSION); ignoring" >&6;} |
29862 $as_echo "$as_me: Potential Build JDK found at $BUILD_JDK is incorrect JDK version ($BUILD_JDK_VERSION); ignoring" >&6;} |
29863 { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Build JDK must be version 9)" >&5 |
29863 { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Build JDK must be version 9)" >&5 |
29864 $as_echo "$as_me: (Your Build JDK must be version 9)" >&6;} |
29864 $as_echo "$as_me: (Your Build JDK must be version 9)" >&6;} |
29865 BUILD_JDK_FOUND=no |
29865 BUILD_JDK_FOUND=no |
29866 else |
29866 else |
29867 # We're done! |
29867 # We're done! |