From ce5c7f0db0d0b2bf0be171eb8d5fbebe7df97fcb Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Wed, 4 Jul 2007 13:57:04 +0000 Subject: [PATCH 1/1] Use $(HC), not $(GHC) to compile ghc-inplace $(GHC) is always the installed compiler, $(HC) changes depending on the stage. This has the nice effect that we build stage2/ghc-inplace using the stage1 compiler, and get to take advantage of bugfixes in stage1 relative to $(GHC) (in particular I want the non-blocking stdin fix for stage2, otherwise piping the testsuite output through tee fails). --- compiler/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/Makefile b/compiler/Makefile index f330340..5e5504b 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -715,7 +715,7 @@ $(INPLACE_HS): Makefile $(FPTOOLS_TOP)/mk/config.mk echo "main = do args <- getArgs; rawSystem \"$(TOP_ABS)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)\" (\"-B$(TOP_ABS)\":args) >>= exitWith" >> $@ $(INPLACE_PROG): $(INPLACE_HS) - $(GHC) --make $< -o $@ + $(HC) --make $< -o $@ all :: $(INPLACE_PROG) -- 1.7.10.4