Thread (2 messages) 2 messages, 2 authors, 2016-06-15

[PATCH 1/1] config.mak.uname: Darwin: Use clang for Mac OS X 10.6

flat view
DORMANTno replies

From: <hidden>
Date: 2016-06-15 23:08:32
Subsystem: the rest · Maintainer: Linus Torvalds

From: Torsten Bögershausen <redacted>

Commit
"tree-diff: catch integer overflow in combine_diff_path allocation"
make gcc under Mac OX 10.6 crash like this:

CC combine-diff.o
combine-diff.c: In function ‘diff_tree_combined’:
combine-diff.c:1391: internal compiler error: Segmentation fault

Xcode for Mac OS X 10.6 has both gcc and clang.
Later versions of Mac OSX/Xcode only provide clang, and gcc is a wrapper
to it.
Make Git compile under Mac OS X 10.6 by using clang instead of gcc

Signed-off-by: Torsten Bögershausen <redacted>
---
 config.mak.uname | 3 +++
 1 file changed, 3 insertions(+)
diff --git a/config.mak.uname b/config.mak.uname
index d6f7980..d0a3df3 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -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
-- 
2.7.0.303.g2c4f448.dirty
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help