]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
Allow for vendor prefix on clang version numbers.
authorDarren Tucker <dtucker@dtucker.net>
Tue, 21 Nov 2023 03:02:18 +0000 (14:02 +1100)
committerDarren Tucker <dtucker@dtucker.net>
Tue, 21 Nov 2023 03:02:18 +0000 (14:02 +1100)
Correctly detects the version of OpenBSD's native clang, as well as
Apple's.  Spotted tb@, ok djm@.

configure.ac

index b951001af26922d6503b4f1b484725c7d7cca3ab..92540d0343c68a8436cb3bb62a2a8836ae430095 100644 (file)
@@ -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])