summaryrefslogtreecommitdiff
path: root/detect-compiler
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2021-08-06 15:20:22 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-08-06 13:30:24 -0700
commit33f13ad7c5cfffdcd446a02dd8ef4b77bc70affe (patch)
treecb1f16bbe6186b33da3fb35c15b86daab7744196 /detect-compiler
parentbuild: update detect-compiler for newer Xcode version (diff)
downloadtgif-33f13ad7c5cfffdcd446a02dd8ef4b77bc70affe.tar.xz
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 <gitster@pobox.com>
Diffstat (limited to 'detect-compiler')
-rwxr-xr-xdetect-compiler4
1 files changed, 2 insertions, 2 deletions
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() {