Mercurial > hg > icedtea8-forest
changeset 2651:224893ede003 icedtea-3.17.0pre01
8233880, PR3798: Support compilers with multi-digit major version numbers
Summary: Also includes JDK-8151841 version changes regressed by JDK-8034788
Reviewed-by: aph, andrew
| author | sgehwolf |
|---|---|
| date | Sat, 22 Aug 2020 18:31:57 +0100 |
| parents | d92a759d5cf6 |
| children | 55dd1d905935 |
| files | common/autoconf/generated-configure.sh common/autoconf/toolchain.m4 |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh Sun Jun 21 23:43:34 2020 +0100 +++ b/common/autoconf/generated-configure.sh Sat Aug 22 18:31:57 2020 +0100 @@ -28176,7 +28176,7 @@ COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \ $SED -e 's/ *Copyright .*//'` COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \ - $SED -e 's/^.* \([1-9]\.[0-9.]*\) .*$/\1/'` + $SED -e 's/^.* \([1-9][0-9]*\.[0-9.]*\) .*$/\1/'` elif test "x$TOOLCHAIN_TYPE" = xclang; then # clang --version output typically looks like # Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn) @@ -29917,7 +29917,7 @@ COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \ $SED -e 's/ *Copyright .*//'` COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \ - $SED -e 's/^.* \([1-9]\.[0-9.]*\) .*$/\1/'` + $SED -e 's/^.* \([1-9][0-9]*\.[0-9.]*\) .*$/\1/'` elif test "x$TOOLCHAIN_TYPE" = xclang; then # clang --version output typically looks like # Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
--- a/common/autoconf/toolchain.m4 Sun Jun 21 23:43:34 2020 +0100 +++ b/common/autoconf/toolchain.m4 Sat Aug 22 18:31:57 2020 +0100 @@ -433,7 +433,7 @@ COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \ $SED -e 's/ *Copyright .*//'` COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \ - $SED -e 's/^.* \(@<:@1-9@:>@\.@<:@0-9.@:>@*\) .*$/\1/'` + $SED -e 's/^.* \(@<:@1-9@:>@@<:@0-9@:>@*\.@<:@0-9.@:>@*\) .*$/\1/'` elif test "x$TOOLCHAIN_TYPE" = xclang; then # clang --version output typically looks like # Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)