Re: What's cooking in git.git (Feb 2016, #07; Thu, 25)

From: Torsten Bögershausen <tboegi@web.de>
Date: Feb 27, 2016, 17:39 UTC
Message-ID: <56D1DF53.1010006@web.de>
In-Reply-To: <56D14C56.6070306@web.de>

How about something like this as a workaround ? (I can send a proper patch, if this is the way forward)

commit dcd7d5551d6931e47829c7febbee0877340eb17f
Author: Torsten Bögershausen <tboegi@web.de>
Date:   Sat Feb 27 15:18:28 2016 +0100

    config.mak.uname: Darwin: Use clang for Mac OS X 10.6

    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

diff --git a/config.mak.uname b/config.mak.uname
index d6f7980..211afec 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]*\)\.'`" -ge 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