8341806: Gcc version detection failure on Alinux3
Reviewed-by: ihse, jwaters
This commit is contained in:
parent
472db922fa
commit
ace44e564f
@ -358,6 +358,11 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_COMPILER_VERSION],
|
|||||||
# Copyright (C) 2013 Free Software Foundation, Inc.
|
# Copyright (C) 2013 Free Software Foundation, Inc.
|
||||||
# This is free software; see the source for copying conditions. There is NO
|
# This is free software; see the source for copying conditions. There is NO
|
||||||
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
|
# or look like
|
||||||
|
# gcc (GCC) 10.2.1 20200825 (Alibaba 10.2.1-3.8 2.32)
|
||||||
|
# Copyright (C) 2020 Free Software Foundation, Inc.
|
||||||
|
# This is free software; see the source for copying conditions. There is NO
|
||||||
|
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
COMPILER_VERSION_OUTPUT=`$COMPILER --version 2>&1`
|
COMPILER_VERSION_OUTPUT=`$COMPILER --version 2>&1`
|
||||||
# Check that this is likely to be GCC.
|
# Check that this is likely to be GCC.
|
||||||
$ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "Free Software Foundation" > /dev/null
|
$ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "Free Software Foundation" > /dev/null
|
||||||
@ -371,7 +376,8 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_COMPILER_VERSION],
|
|||||||
COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
|
COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
|
||||||
$SED -e 's/ *Copyright .*//'`
|
$SED -e 's/ *Copyright .*//'`
|
||||||
COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
|
COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
|
||||||
$SED -e 's/^.* \(@<:@1-9@:>@<:@0-9@:>@*\.@<:@0-9.@:>@*\)@<:@^0-9.@:>@.*$/\1/'`
|
$AWK -F ')' '{print [$]2}' | \
|
||||||
|
$AWK '{print [$]1}'`
|
||||||
elif test "x$TOOLCHAIN_TYPE" = xclang; then
|
elif test "x$TOOLCHAIN_TYPE" = xclang; then
|
||||||
# clang --version output typically looks like
|
# clang --version output typically looks like
|
||||||
# Apple clang version 15.0.0 (clang-1500.3.9.4)
|
# Apple clang version 15.0.0 (clang-1500.3.9.4)
|
||||||
|
Loading…
Reference in New Issue
Block a user