# 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?
$(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 $@