22 lines
943 B
Diff
22 lines
943 B
Diff
# HG changeset patch
|
|
# User fweimer
|
|
# Date 1573592408 0
|
|
# Tue Nov 12 21:00:08 2019 +0000
|
|
# Node ID a60e328f4f3dfb06fad4e071575f5f45196d4fc3
|
|
# Parent 9828d04ee2c7e1aefe07acb61706375ea5da58b7
|
|
8233880: Support compilers with multi-digit major version numbers
|
|
Reviewed-by: tbell
|
|
|
|
diff --git a/make/autoconf/toolchain.m4 b/make/autoconf/toolchain.m4
|
|
--- a/make/autoconf/toolchain.m4
|
|
+++ b/make/autoconf/toolchain.m4
|
|
@@ -461,7 +461,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.@:>@*\)@<:@^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)
|