[PATCH 2/2] Revert "config.mak.uname: use clang for Mac OS X 10.6"
- From
Eric Sunshine <sunshine@sunshineco.com>
- Date
- Mar 21, 2016, 04:35 UTC
- Message-ID
- <1458534958-6956-3-git-send-email-sunshine@sunshineco.com>
- In-Reply-To
- <1458534958-6956-1-git-send-email-sunshine@sunshineco.com>
This reverts commit 7b6daf8d2fee1a9866b1d4eddbfaa5dbc42c5dbb.
Now that st_add4() has been patched to work around the gcc 4.2.x compiler crash, revert the sledge-hammer approach of forcing Mac OS X 10.6 to unconditionally use 'clang' rather than the default compiler (gcc).
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> ---
I verified that the work-around in patch 1/2 "fixes" the crash on FreeBSD, and I'm pretty confident that it fixes it as well on Mac OS X 10.6 since it manifested identically on both platforms, but it would still be nice to receive confirmation from Torsten.
config.mak.uname | 3 --- 1 file changed, 3 deletions(-)
diff --git a/config.mak.uname b/config.mak.uname index 1139b44..fe8096f 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -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
-- 2.8.0.rc3.240.g104e649