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"maint
commit
074677315c
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue