From 085025b1e45218eb4f9ef7fda055e23f03b8e1b7 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Tue, 31 Jul 2007 11:49:25 +0000 Subject: [PATCH] compile the -inplace programs using $(HC), not $(GHC) $(UseStage1) modifies $(HC) rather than $(GHC) --- utils/ghc-pkg/Makefile | 2 +- utils/hsc2hs/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/ghc-pkg/Makefile b/utils/ghc-pkg/Makefile index 47b4ebe..698cdc1 100644 --- a/utils/ghc-pkg/Makefile +++ b/utils/ghc-pkg/Makefile @@ -70,7 +70,7 @@ $(INPLACE_HS): Makefile $(FPTOOLS_TOP)/mk/config.mk echo "main = do args <- getArgs; rawSystem \"$(TOP_ABS)/$(GHC_PKG_DIR_REL)/$(HS_PROG)\" (\"--global-conf\":\"$(TOP_ABS)/driver/package.conf.inplace\":args) >>= exitWith" >> $@ $(INPLACE_PROG): $(INPLACE_HS) - $(GHC) --make $< -o $@ + $(HC) --make $< -o $@ all :: $(INPLACE_PROG) diff --git a/utils/hsc2hs/Makefile b/utils/hsc2hs/Makefile index c60705f..e068550 100644 --- a/utils/hsc2hs/Makefile +++ b/utils/hsc2hs/Makefile @@ -48,7 +48,7 @@ $(INPLACE_HS): Makefile $(FPTOOLS_TOP)/mk/config.mk echo "main = do args <- getArgs; rawSystem \"$(TOP_ABS)/$(GHC_HSC2HS_DIR_REL)/$(HS_PROG)\" (\"--template=$(TOP_ABS)/$(GHC_HSC2HS_DIR_REL)/template-hsc.h\":\"--cc=$(CC)\":\"--ld=$(CC)\"$(patsubst %,:\"%\",$(extra_flags)):\"--cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt)\":\"-I$(TOP_ABS)/$(GHC_INCLUDE_DIR_REL)\":\"-I$(TOP_ABS)/gmp/gmpbuild\":args) >>= exitWith" >> $@ $(INPLACE_PROG): $(INPLACE_HS) - $(GHC) --make $< -o $@ + $(HC) --make $< -o $@ all :: $(INPLACE_PROG) -- 1.7.10.4