summaryrefslogtreecommitdiff
path: root/detect-compiler
diff options
context:
space:
mode:
authorCarlo Marcelo Arenas Belón <carenas@gmail.com>2021-08-06 08:06:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-08-06 20:29:00 (GMT)
commitf6bb2099bf0f982bd3d43fe479b8272d5bf18a6a (patch)
tree6136b273241de0b9b8965f4870109f27f1b2bb36 /detect-compiler
parentebf3c04b262aa27fbb97f8a0156c2347fecafafb (diff)
downloadgit-f6bb2099bf0f982bd3d43fe479b8272d5bf18a6a.zip
git-f6bb2099bf0f982bd3d43fe479b8272d5bf18a6a.tar.gz
git-f6bb2099bf0f982bd3d43fe479b8272d5bf18a6a.tar.bz2
build: update detect-compiler for newer Xcode version
1da1580e4c (Makefile: detect compiler and enable more warnings in DEVELOPER=1, 2018-04-14) uses the output of the compiler banner to detect the compiler family. Apple had since changed the wording used to refer to its compiler as clang instead of LLVM as shown by: $ cc --version Apple clang version 12.0.5 (clang-1205.0.22.9) Target: x86_64-apple-darwin20.6.0 Thread model: posix InstalledDir: /Library/Developer/CommandLineTools/usr/bin so update the script to match, and allow DEVELOPER=1 to work as expected again in macOS. Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'detect-compiler')
-rwxr-xr-xdetect-compiler2
1 files changed, 1 insertions, 1 deletions
diff --git a/detect-compiler b/detect-compiler
index 70b7544..c85be83 100755
--- a/detect-compiler
+++ b/detect-compiler
@@ -44,7 +44,7 @@ clang)
"FreeBSD clang")
print_flags clang
;;
-"Apple LLVM")
+"Apple LLVM"|"Apple clang")
print_flags clang
;;
*)