From c0ed7590cec39994ac622a333d5aa469de5af67e Mon Sep 17 00:00:00 2001 From: Eric Sunshine Date: Mon, 21 Mar 2016 00:35:58 -0400 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- config.mak.uname | 3 --- 1 file changed, 3 deletions(-) diff --git a/config.mak.uname b/config.mak.uname index 4c68e078e..d6f7980bb 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