From 33f13ad7c5cfffdcd446a02dd8ef4b77bc70affe Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 6 Aug 2021 15:20:22 -0400 Subject: build: clang version may not be followed by extra words The get_family and get_version helpers of detect-compiler assume that the line to identify the version from the compilers have a token "version", followed by the version number, followed by some other string, e.g. $ CC=gcc get_version_line gcc version 10.2.1 20210110 (Debian 10.2.1-6) But that is not necessarily true, e.g. $ CC=clang get_version_line Debian clang version 11.0.1-2 Tweak the script not to require extra string after the version. Signed-off-by: Junio C Hamano --- detect-compiler | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'detect-compiler') diff --git a/detect-compiler b/detect-compiler index c85be83c64..955be1c906 100755 --- a/detect-compiler +++ b/detect-compiler @@ -13,11 +13,11 @@ get_version_line() { } get_family() { - get_version_line | sed 's/^\(.*\) version [0-9][^ ]* .*/\1/' + get_version_line | sed 's/^\(.*\) version [0-9].*/\1/' } get_version() { - get_version_line | sed 's/^.* version \([0-9][^ ]*\) .*/\1/' + get_version_line | sed 's/^.* version \([0-9][^ ]*\).*/\1/' } print_flags() { -- cgit v1.2.3