Andrew's git / gitweb.git / diff
?
Merge branch 'tb/avoid-gcc-on-darwin-10-6'
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Mar 2016 16:20:13 +0000 (09:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Mar 2016 16:20:13 +0000 (09:20 -0700)
* tb/avoid-gcc-on-darwin-10-6:
Revert "config.mak.uname: use clang for Mac OS X 10.6"

config.mak.uname patch | blob | history
diff --git a/config.mak.uname b/config.mak.uname
index 1139b4400743a8a9a687967a9dff5529d876b0c0..fe8096f8a65241760cfdc3dabd4cf63ee412e9ca 100644 (file)
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -103,9 +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