diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-03-21 09:20:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-21 09:20:13 -0700 |
| commit | 074677315cb0bd3296f78bc7f74943d5834cba91 (patch) | |
| tree | a2aa072b6170680d433f867fe92a50a4916cd02d | |
| parent | b552ff8c67d1b1c60d7d1fcf25a0603a37649b4f (diff) | |
| parent | c0ed7590cec39994ac622a333d5aa469de5af67e (diff) | |
| download | git-074677315cb0bd3296f78bc7f74943d5834cba91.tar.gz git-074677315cb0bd3296f78bc7f74943d5834cba91.tar.xz | |
Merge branch 'tb/avoid-gcc-on-darwin-10-6'
* tb/avoid-gcc-on-darwin-10-6:
Revert "config.mak.uname: use clang for Mac OS X 10.6"
| -rw-r--r-- | config.mak.uname | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/config.mak.uname b/config.mak.uname index 1139b4400..fe8096f8a 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -103,9 +103,6 @@ ifeq ($(uname_S),Darwin) ifeq ($(shell expr "$(uname_R)" : '[15]\.'),2) NO_STRLCPY = YesPlease endif - ifeq ($(shell test "`expr "$(uname_R)" : '\([0-9][0-9]*\)\.'`" -eq 10 && echo 1),1) - CC = clang - endif ifeq ($(shell test "`expr "$(uname_R)" : '\([0-9][0-9]*\)\.'`" -ge 11 && echo 1),1) HAVE_GETDELIM = YesPlease endif |