OpenJDK / jdk / jdk
changeset 59251:4f8be70ec25d
8244756: Build broken with some awk version after JDK-8244248
Reviewed-by: mbaesken, xliu
Contributed-by: Magnus Ihse Bursie <magnus.ihse.bursie@oracle.com>
| author | mdoerr |
|---|---|
| date | Tue, 12 May 2020 11:11:02 +0200 |
| parents | 08fda454c3df |
| children | dd0caf00b05c |
| files | make/autoconf/boot-jdk.m4 |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/make/autoconf/boot-jdk.m4 Tue May 12 10:59:12 2020 +0200 +++ b/make/autoconf/boot-jdk.m4 Tue May 12 11:11:02 2020 +0200 @@ -75,7 +75,7 @@ else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? # Additional [] needed to keep m4 from mangling shell constructs. - [ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java$EXE_SUFFIX" $USER_BOOT_JDK_OPTIONS -version 2>&1 | $AWK '/version \"[0-9\._\-a-zA-Z]+\"/{print $ 0; exit;}'` ] + [ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java$EXE_SUFFIX" $USER_BOOT_JDK_OPTIONS -version 2>&1 | $AWK '/version \"[0-9a-zA-Z\._\-]+\"/{print $ 0; exit;}'` ] if [ [[ "$BOOT_JDK_VERSION" =~ "Picked up" ]] ]; then AC_MSG_NOTICE([You have _JAVA_OPTIONS or JAVA_TOOL_OPTIONS set. This can mess up the build. Please use --with-boot-jdk-jvmargs instead.]) AC_MSG_NOTICE([Java reports: "$BOOT_JDK_VERSION".]) @@ -531,7 +531,7 @@ else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? # Additional [] needed to keep m4 from mangling shell constructs. - [ BUILD_JDK_VERSION=`"$BUILD_JDK/bin/java" -version 2>&1 | $AWK '/version \"[0-9\._\-a-zA-Z]+\"/{print $ 0; exit;}'` ] + [ BUILD_JDK_VERSION=`"$BUILD_JDK/bin/java" -version 2>&1 | $AWK '/version \"[0-9a-zA-Z\._\-]+\"/{print $ 0; exit;}'` ] # Extra M4 quote needed to protect [] in grep expression. [FOUND_CORRECT_VERSION=`echo $BUILD_JDK_VERSION | $EGREP "\"$VERSION_FEATURE([\.+-].*)?\""`]