git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Torsten Bögershausen" <tboegi@web.de>
To: "Torsten Bögershausen" <tboegi@web.de>,
	"Jeff King" <peff@peff.net>, "Junio C Hamano" <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Feb 2016, #07; Thu, 25)
Date: Sat, 27 Feb 2016 18:39:31 +0100	[thread overview]
Message-ID: <56D1DF53.1010006@web.de> (raw)
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

  reply	other threads:[~2016-02-27 17:40 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-25 23:14 What's cooking in git.git (Feb 2016, #07; Thu, 25) Junio C Hamano
2016-02-26 16:10 ` Torsten Bögershausen
2016-02-26 18:29   ` Junio C Hamano
2016-02-26 22:34     ` Torsten Bögershausen
2016-02-26 23:35       ` Junio C Hamano
2016-02-27  3:29         ` Jeff King
2016-02-27  7:12           ` Torsten Bögershausen
2016-02-27 17:39             ` Torsten Bögershausen [this message]
2016-02-28 18:21               ` Junio C Hamano
2016-02-28 20:09                 ` [PATCH 1/1] config.mak.uname: Darwin: Use clang for Mac OS X 10.6 tboegi
2016-02-29 10:18             ` What's cooking in git.git (Feb 2016, #07; Thu, 25) Jeff King
2016-02-29 16:28               ` Eric Sunshine
2016-02-29 17:17                 ` Junio C Hamano
2016-02-29 23:37                   ` Eric Sunshine

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=56D1DF53.1010006@web.de \
    --to=tboegi@web.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).