Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Revert "config.mak.uname: use clang for Mac OS X 10.6"
This reverts commit 7b6daf8.

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>
  • Loading branch information
Eric Sunshine authored and Junio C Hamano committed Mar 21, 2016
1 parent 7b6daf8 commit c0ed759
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions config.mak.uname
Expand Up @@ -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
Expand Down

0 comments on commit c0ed759

Please sign in to comment.