]> granicus.if.org Git - git/commitdiff
Revert "config.mak.uname: use clang for Mac OS X 10.6"
authorEric Sunshine <sunshine@sunshineco.com>
Mon, 21 Mar 2016 04:35:58 +0000 (00:35 -0400)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Mar 2016 16:20:02 +0000 (09:20 -0700)
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>
config.mak.uname

index 4c68e078e7ac4a9584b2782f278b00fcbe594505..d6f7980bb91ab7d1e4a02a91407bd8e38461671b 100644 (file)
@@ -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