32 lines
1.7 KiB
Diff
32 lines
1.7 KiB
Diff
--- a/make/autoconf/generated-configure.sh
|
|
+++ b/make/autoconf/generated-configure.sh
|
|
@@ -34373,7 +34373,7 @@ $as_echo "$as_me: The result from runnin
|
|
COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
|
|
$SED -e 's/ *[Uu]sage:.*//'`
|
|
COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
|
|
- $SED -e "s/^.*[ ,\t]$COMPILER_NAME[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/"`
|
|
+ $SED -e "s/^.*[ ,\t]$COMPILER_NAME[ ,\t]\([1-9][0-9]*\.[0-9][0-9]*\).*/\1/"`
|
|
elif test "x$TOOLCHAIN_TYPE" = xxlc; then
|
|
# xlc -qversion output typically looks like
|
|
# IBM XL C/C++ for AIX, V11.1 (5724-X13)
|
|
@@ -34434,7 +34434,7 @@ $as_echo "$as_me: The result from runnin
|
|
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.]*\)[^0-9.].*$/\1/'`
|
|
+ $SED -e 's/^.* \([1-9][0-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/make/autoconf/toolchain.m4
|
|
+++ b/make/autoconf/toolchain.m4
|
|
@@ -424,7 +424,7 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_COMPILER_VER
|
|
# Collapse compiler output into a single line
|
|
COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT`
|
|
COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
|
|
- $SED -e 's/^.* version \(@<:@1-9@:>@@<:@0-9.@:>@*\).*$/\1/'`
|
|
+ $SED -e 's/^.* version \(@<:@1-9@:>@@<:@0-9@:>@*\.@<:@0-9.@:>@*\).*$/\1/'`
|
|
else
|
|
AC_MSG_ERROR([Unknown toolchain type $TOOLCHAIN_TYPE.])
|
|
fi
|