diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-10-12 13:51:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-12 13:51:41 -0700 |
| commit | 689cfaf9e754515d81d602d3cee7781c1dadf41f (patch) | |
| tree | 1f379f501b1f0cb8ebf875163c2c1c9929f68e65 | |
| parent | Merge branch 'rs/branch-allow-deleting-dangling' into maint (diff) | |
| parent | build: catch clang that identifies itself as "$VENDOR clang" (diff) | |
| download | tgif-689cfaf9e754515d81d602d3cee7781c1dadf41f.tar.xz | |
Merge branch 'cb/makefile-apple-clang' into maint
Build update for Apple clang.
* cb/makefile-apple-clang:
build: catch clang that identifies itself as "$VENDOR clang"
build: clang version may not be followed by extra words
build: update detect-compiler for newer Xcode version
| -rwxr-xr-x | detect-compiler | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/detect-compiler b/detect-compiler index 70b754481c..11d60da5b7 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() { @@ -38,10 +38,7 @@ case "$(get_family)" in gcc) print_flags gcc ;; -clang) - print_flags clang - ;; -"FreeBSD clang") +clang | *" clang") print_flags clang ;; "Apple LLVM") |