diff options
| author | Kazu Yamamoto <kazu@iij.ad.jp> | 2014-01-13 22:06:03 -0600 |
|---|---|---|
| committer | Austin Seipp <austin@well-typed.com> | 2014-01-14 03:49:21 -0600 |
| commit | df1197a58ca0923405580bd8d89eca77b2f5c718 (patch) | |
| tree | fba0715d0865cbb035a84a6955e6e7d775588068 /libraries/integer-gmp | |
| parent | d075e1c20271bd70c6068ab05e9249d78b75771f (diff) | |
| download | haskell-df1197a58ca0923405580bd8d89eca77b2f5c718.tar.gz | |
Fix in-tree GMP build (#8497) on OS X Mavericks
Signed-off-by: Austin Seipp <austin@well-typed.com>
Diffstat (limited to 'libraries/integer-gmp')
| -rw-r--r-- | libraries/integer-gmp/gmp/ghc.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libraries/integer-gmp/gmp/ghc.mk b/libraries/integer-gmp/gmp/ghc.mk index 1ded05047d..a5d33ab842 100644 --- a/libraries/integer-gmp/gmp/ghc.mk +++ b/libraries/integer-gmp/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= |