Skip to content

Commit 0194200

Browse files
committed
Merge branch 'tb/avoid-gcc-on-darwin-10-6'
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
2 parents 090de6b + 7b6daf8 commit 0194200

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

config.mak.uname

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,9 @@ ifeq ($(uname_S),Darwin)
102102
ifeq ($(shell expr "$(uname_R)" : '[15]\.'),2)
103103
NO_STRLCPY = YesPlease
104104
endif
105+
ifeq ($(shell test "`expr "$(uname_R)" : '\([0-9][0-9]*\)\.'`" -eq 10 && echo 1),1)
106+
CC = clang
107+
endif
105108
ifeq ($(shell test "`expr "$(uname_R)" : '\([0-9][0-9]*\)\.'`" -ge 11 && echo 1),1)
106109
HAVE_GETDELIM = YesPlease
107110
endif

0 commit comments

Comments
 (0)