diff options
| author | Darren Tucker <dtucker@dtucker.net> | 2023-11-21 14:02:18 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2023-11-21 14:02:18 +1100 |
| commit | 2a19e02f36b16f0f6cc915f7d1e60ead5e36303b (patch) | |
| tree | 52445c80142ffbb059cbfec978605981c7888793 | |
| parent | c52db0114826d73eff6cdbf205e9c1fa4f7ca6c6 (diff) | |
| download | openssh-2a19e02f36b16f0f6cc915f7d1e60ead5e36303b.tar.gz | |
Allow for vendor prefix on clang version numbers.
Correctly detects the version of OpenBSD's native clang, as well as
Apple's. Spotted tb@, ok djm@.
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index b951001af..92540d034 100644 --- a/configure.ac +++ b/configure.ac @@ -189,10 +189,11 @@ if test "$GCC" = "yes" || test "$GCC" = "egcs"; then AC_MSG_CHECKING([clang version]) ver="`$CC -v 2>&1`" if echo "$ver" | grep "Apple" >/dev/null; then - CLANG_VER="apple-`echo "$ver" | \ - awk '/Apple LLVM/ {print $4"-"$5}'`" + CLANG_VER=apple-`echo "$ver" | grep 'clang version' | \ + $SED 's/.*clang version //g' | $AWK '{print $1}'` else - CLANG_VER=`echo "$ver" | $AWK '/clang version /{print $3}'` + CLANG_VER=`echo "$ver" | grep 'clang version' | \ + $SED 's/.*clang version //g' | $AWK '{print $1}'` fi AC_MSG_RESULT([$CLANG_VER]) |