Skip to content

Commit

Permalink
Merge branch 'tb/avoid-gcc-on-darwin-10-6'
Browse files Browse the repository at this point in the history
Out-of-maintenance gcc on OSX 10.6 fails to compile the code in
'master'; work it around by using clang by default on the platform.

* tb/avoid-gcc-on-darwin-10-6:
  config.mak.uname: use clang for Mac OS X 10.6
  • Loading branch information
Junio C Hamano committed Mar 4, 2016
2 parents 090de6b + 7b6daf8 commit 0194200
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions config.mak.uname
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,9 @@ 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 0194200

Please sign in to comment.