[commit: packages/integer-gmp] master: Fix in-tree GMP build (#8497) on OS X Mavericks (d2e957d)
git at git.haskell.org
git at git.haskell.org
Tue Jan 14 09:49:31 UTC 2014
Repository : ssh://git@git.haskell.org/integer-gmp
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/d2e957dac5738cc694e2c6cab7f56c2b486ed1a4/integer-gmp
>---------------------------------------------------------------
commit d2e957dac5738cc694e2c6cab7f56c2b486ed1a4
Author: Kazu Yamamoto <kazu at iij.ad.jp>
Date: Mon Jan 13 22:06:03 2014 -0600
Fix in-tree GMP build (#8497) on OS X Mavericks
Signed-off-by: Austin Seipp <austin at well-typed.com>
>---------------------------------------------------------------
d2e957dac5738cc694e2c6cab7f56c2b486ed1a4
gmp/ghc.mk | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/gmp/ghc.mk b/gmp/ghc.mk
index 1ded050..a5d33ab 100644
--- a/gmp/ghc.mk
+++ b/gmp/ghc.mk
@@ -103,6 +103,14 @@ endif
libraries/integer-gmp_dist-install_EXTRA_CC_OPTS += $(gmp_CC_OPTS)
+CLANG = $(findstring clang, $(shell $(CC_STAGE1) --version))
+
+ifeq "$(CLANG)" "clang"
+CCX = $(CLANG)
+else
+CCX = $(CC_STAGE1)
+endif
+
# 2007-09-26
# set -o igncr
# is not a valid command on non-Cygwin-systems.
@@ -138,7 +146,7 @@ libraries/integer-gmp/gmp/libgmp.a libraries/integer-gmp/gmp/gmp.h:
PATH=`pwd`:$$PATH; \
export PATH; \
cd gmpbuild && \
- CC=$(CC_STAGE1) NM=$(NM) AR=$(AR_STAGE1) $(SHELL) ./configure \
+ CC=$(CCX) NM=$(NM) AR=$(AR_STAGE1) $(SHELL) ./configure \
--enable-shared=no \
--host=$(HOSTPLATFORM) --build=$(BUILDPLATFORM)
$(MAKE) -C libraries/integer-gmp/gmp/gmpbuild MAKEFLAGS=
More information about the ghc-commits
mailing list