Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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"
  • Loading branch information
Junio C Hamano committed Mar 21, 2016
2 parents b552ff8 + c0ed759 commit 0746773
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions config.mak.uname
Expand Up @@ -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
Expand Down

0 comments on commit 0746773

Please sign in to comment.