summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-03-04 13:46:08 -0800
committerJunio C Hamano <gitster@pobox.com>2016-03-04 13:46:08 -0800
commit01942002b3cb88f607a5e97b9fa5d1b104e07af5 (patch)
treedf02e6be57d467746d8dd424d37717bdc9aa732c
parent090de6b289ff2d9fc1c82ef85069bd6cba296d63 (diff)
parent7b6daf8d2fee1a9866b1d4eddbfaa5dbc42c5dbb (diff)
downloadgit-01942002b3cb88f607a5e97b9fa5d1b104e07af5.tar.gz
Merge branch 'tb/avoid-gcc-on-darwin-10-6'
Out-of-maintenance gcc on OSX 10.6 fails to compile the code in 'master'; work it around by using clang by default on the platform. * tb/avoid-gcc-on-darwin-10-6: config.mak.uname: use clang for Mac OS X 10.6
-rw-r--r--config.mak.uname3
1 files changed, 3 insertions, 0 deletions
diff --git a/config.mak.uname b/config.mak.uname
index d6f7980bb9..4c68e078e7 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -102,6 +102,9 @@ 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