summaryrefslogtreecommitdiff
path: root/config.mak.uname
diff options
context:
space:
mode:
authorTorsten Bögershausen <tboegi@web.de>2016-02-28 21:09:44 +0100
committerJunio C Hamano <gitster@pobox.com>2016-02-28 16:34:23 -0800
commit7b6daf8d2fee1a9866b1d4eddbfaa5dbc42c5dbb (patch)
treee0627bff349d648799feab64bf319d676a32ee83 /config.mak.uname
parentf02fbc4f9433937ee0463d0342d6d7d97e1f6f1e (diff)
downloadgit-7b6daf8d2fee1a9866b1d4eddbfaa5dbc42c5dbb.tar.gz
config.mak.uname: use clang for Mac OS X 10.6
Gcc under Mac OX 10.6 throws an internal compiler error: CC combine-diff.o combine-diff.c: In function ‘diff_tree_combined’: combine-diff.c:1391: internal compiler error: Segmentation fault while attempting to build Git at 5b442c4f (tree-diff: catch integer overflow in combine_diff_path allocation, 2016-02-19). As clang that ships with the version does not have the same bug, make Git compile under Mac OS X 10.6 by using clang instead of gcc to work this around, as it is unlikely that we will see fixed GCC on that platform. Later versions of Mac OSX/Xcode only provide clang, and gcc is a wrapper to it. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'config.mak.uname')
-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