mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'cb/makefile-apple-clang'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2021-09-08 13:30:33 -07:00
parent 7ad8ddecfd f32c5d3716
commit f7ab826740
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
detect-compiler
View File

@ -13,11 +13,11 @@ get_version_line() {
} }
get_family() { get_family() {
get_version_line | sed 's/^\(.*\) version [0-9][^ ]* .*/\1/' get_version_line | sed 's/^\(.*\) version [0-9].*/\1/'
} }
get_version() { get_version() {
get_version_line | sed 's/^.* version \([0-9][^ ]*\) .*/\1/' get_version_line | sed 's/^.* version \([0-9][^ ]*\).*/\1/'
} }
print_flags() { print_flags() {
@ -38,10 +38,7 @@ case "$(get_family)" in
gcc) gcc)
print_flags gcc print_flags gcc
;; ;;
clang) clang | *" clang")
print_flags clang
;;
"FreeBSD clang")
print_flags clang print_flags clang
;; ;;
"Apple LLVM") "Apple LLVM")