From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Mar 2016 16:20:13 +0000 (-0700)
Subject: Merge branch 'tb/avoid-gcc-on-darwin-10-6'
X-Git-Tag: v2.8.0-rc4~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/074677315cb0bd3296f78bc7f74943d5834cba91?ds=inline;hp=-c

Merge branch 'tb/avoid-gcc-on-darwin-10-6'

* tb/avoid-gcc-on-darwin-10-6:
Revert "config.mak.uname: use clang for Mac OS X 10.6"
---

074677315cb0bd3296f78bc7f74943d5834cba91
diff --combined config.mak.uname
index 1139b44007,d6f7980bb9..fe8096f8a6
--- a/config.mak.uname
+++ b/config.mak.uname
@@@ -37,7 -37,6 +37,7 @@@ ifeq ($(uname_S),Linux
  	HAVE_CLOCK_GETTIME = YesPlease
  	HAVE_CLOCK_MONOTONIC = YesPlease
  	HAVE_GETDELIM = YesPlease
 +	SANE_TEXT_GREP=-a
  endif
  ifeq ($(uname_S),GNU/kFreeBSD)
  	HAVE_ALLOCA_H = YesPlease
@@@ -103,9 -102,6 +103,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