X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=25cedabdacaed5490d1900b41c320d8239ee336d;hb=12ee8b3dcf37a2f6974167886e17ae2e03c9cd72;hp=0b8453603092cf04442854163b56b9a2b3673136;hpb=8bac478832e0cf9fa7ad1cfc81c08b0b9f13938e;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index 0b84536..25cedab 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -410,11 +410,16 @@ endif
 # enabled when we are bootstrapping with the same version of GHC, and
 # the interpreter is supported on this platform.
 
+ifeq "$(bootstrapped)" "YES"
+SRC_HC_OPTS += -package hpc
+PKG_DEPENDS += hpc
+endif
+
 ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES"
 
 # Yes, include the interepreter, readline, and Template Haskell extensions
-SRC_HC_OPTS += -DGHCI -package template-haskell -package hpc
-PKG_DEPENDS += template-haskell hpc
+SRC_HC_OPTS += -DGHCI -package template-haskell
+PKG_DEPENDS += template-haskell
 
 # Should GHCI be building info tables in the TABLES_NEXT_TO_CODE style
 # or not?
@@ -720,7 +725,7 @@ endif
 
 $(INPLACE_HS): Makefile $(FPTOOLS_TOP)/mk/config.mk
 	echo "import System.Cmd; import $(EnvImport); import System.Exit" > $@
-	echo "main = do args <- $(GetArgs); rawSystem \"$(TOP_ABS)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)\" (\"-B$(TOP_ABS)\":args) >>= exitWith" >> $@
+	echo "main = do args <- $(GetArgs); rawSystem \"$(TOP_ABS)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)\" (\"-B$(TOP_ABS)\":\"-fhardwire-lib-paths\":args) >>= exitWith" >> $@
 
 $(INPLACE_PROG): $(INPLACE_HS)
 	$(HC) --make $< -o $@