From: Eric Sunshine <sunshine@sunshineco.com>
Date: Mon, 21 Mar 2016 04:35:58 +0000 (-0400)
Subject: Revert "config.mak.uname: use clang for Mac OS X 10.6"
X-Git-Tag: v2.8.0-rc4~2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c0ed7590cec39994ac622a333d5aa469de5af67e;p=git

Revert "config.mak.uname: use clang for Mac OS X 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>
---

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