summaryrefslogtreecommitdiff
path: root/config.mak.uname
diff options
context:
space:
mode:
authorEric Sunshine <sunshine@sunshineco.com>2016-03-21 00:35:58 -0400
committerJunio C Hamano <gitster@pobox.com>2016-03-21 09:20:02 -0700
commitc0ed7590cec39994ac622a333d5aa469de5af67e (patch)
treed09ac23c3383170ce063e2b596345fc8e6d82a07 /config.mak.uname
parent7b6daf8d2fee1a9866b1d4eddbfaa5dbc42c5dbb (diff)
downloadgit-c0ed7590cec39994ac622a333d5aa469de5af67e.tar.gz
Revert "config.mak.uname: use clang for Mac OS X 10.6"tb/avoid-gcc-on-darwin-10-6
This reverts commit 7b6daf8d2fee1a9866b1d4eddbfaa5dbc42c5dbb. Now that st_add4() has been patched to work around the gcc 4.2.x compiler crash, revert the sledge-hammer approach of forcing Mac OS X 10.6 to unconditionally use 'clang' rather than the default compiler (gcc). Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'config.mak.uname')
-rw-r--r--config.mak.uname3
1 files changed, 0 insertions, 3 deletions
diff --git a/config.mak.uname b/config.mak.uname
index 4c68e078e7..d6f7980bb9 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -102,9 +102,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