[commit: integer-gmp] master: Follow CC var changes in makefiles (2567c97)
Ian Lynagh
igloo at earth.li
Sat Apr 23 20:27:07 CEST 2011
Repository : ssh://darcs.haskell.org//srv/darcs/packages/integer-gmp
On branch : master
http://hackage.haskell.org/trac/ghc/changeset/2567c97aaa467cb676a6ecc2cf840c92ee1cb6ec
>---------------------------------------------------------------
commit 2567c97aaa467cb676a6ecc2cf840c92ee1cb6ec
Author: Ian Lynagh <igloo at earth.li>
Date: Sat Apr 23 17:23:50 2011 +0100
Follow CC var changes in makefiles
>---------------------------------------------------------------
gmp/ghc.mk | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gmp/ghc.mk b/gmp/ghc.mk
index 51540c3..c65835e 100644
--- a/gmp/ghc.mk
+++ b/gmp/ghc.mk
@@ -43,7 +43,7 @@ libraries/integer-gmp_CC_OPTS += $(addprefix -I,$(GMP_INCLUDE_DIRS))
libraries/integer-gmp_CC_OPTS += $(addprefix -L,$(GMP_LIB_DIRS))
libraries/integer-gmp/cbits/mkGmpDerivedConstants$(exeext): libraries/integer-gmp/cbits/mkGmpDerivedConstants.c
- "$(CC)" $(SRC_CC_OPTS) $(CONF_CC_OPTS_STAGE1) $(libraries/integer-gmp_CC_OPTS) $< -o $@
+ "$(CC_STAGE1)" $(SRC_CC_OPTS) $(CONF_CC_OPTS_STAGE1) $(libraries/integer-gmp_CC_OPTS) $< -o $@
libraries/integer-gmp/cbits/GmpDerivedConstants.h: libraries/integer-gmp/cbits/mkGmpDerivedConstants$(exeext)
$< > $@
@@ -129,7 +129,7 @@ libraries/integer-gmp/gmp/libgmp.a libraries/integer-gmp/gmp/gmp.h:
PATH=`pwd`:$$PATH; \
export PATH; \
cd gmpbuild && \
- CC=$(WhatGccIsCalled) NM=$(NM) AR=$(AR_STAGE1) $(SHELL) configure \
+ CC=$(CC_STAGE1) NM=$(NM) AR=$(AR_STAGE1) $(SHELL) configure \
--enable-shared=no \
--host=$(HOSTPLATFORM) --build=$(BUILDPLATFORM)
$(MAKE) -C libraries/integer-gmp/gmp/gmpbuild MAKEFLAGS=
@@ -149,7 +149,7 @@ libraries/integer-gmp/gmp/libgmp.a libraries/integer-gmp/gmp/gmp.h:
# PATH=`pwd`:$$PATH; \
# export PATH; \
# cd gmpbuild-shared && \
-# CC=$(WhatGccIsCalled) $(SHELL) configure \
+# CC=$(CC_STAGE1) $(SHELL) configure \
# --enable-shared=yes --disable-static \
# --host=$(HOSTPLATFORM) --build=$(BUILDPLATFORM)
# touch $@
More information about the Cvs-libraries
mailing list