Follow CC var changes in makefiles
authorIan Lynagh <igloo@earth.li>
Sat, 23 Apr 2011 16:23:50 +0000 (17:23 +0100)
committerIan Lynagh <igloo@earth.li>
Sat, 23 Apr 2011 16:23:50 +0000 (17:23 +0100)
gmp/ghc.mk

index 51540c3..c65835e 100644 (file)
@@ -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 $@