Better panic reporting

[ghc-hetmet.git] / compiler / Makefile

diff --git a/compiler/Makefile b/compiler/Makefile
index fd6afb1..1870153 100644 (file)
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -188,6 +188,7 @@ CONFIGURE_FLAGS_STAGE3 = $(CONFIGURE_FLAGS_STAGE2)
 CONFIGURE_FLAGS_STAGE1 += $(USE_BOOT_CONFIGURE_FLAGS)
 CONFIGURE_FLAGS_STAGE2 += $(USE_STAGE1_CONFIGURE_FLAGS)
 CONFIGURE_FLAGS_STAGE3 += $(USE_STAGE2_CONFIGURE_FLAGS)
+CONFIGURE_FLAGS_STAGE3 += --package-db $(STAGE3_PACKAGE_CONF)
 
 # In a source dist we don't need to worry about Parser.y(.pp) as we have
 # the .hs file pre-generated
@@ -245,7 +246,7 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk
        @echo "cHscIfaceFileVersion  :: String" >> $(CONFIG_HS)
        @echo "cHscIfaceFileVersion  = \"$(HscIfaceFileVersion)\"" >> $(CONFIG_HS)
        @echo "cSplitObjs            :: String" >> $(CONFIG_HS)
-       @echo "cSplitObjs            = \"$(SplitObjs)\"" >> $(CONFIG_HS)
+       @echo "cSplitObjs            = \"$(SupportsSplitObjs)\"" >> $(CONFIG_HS)
        @echo "cGhcWithInterpreter   :: String" >> $(CONFIG_HS)
        @echo "cGhcWithInterpreter   = \"$(GhcWithInterpreter)\"" >> $(CONFIG_HS)
        @echo "cGhcWithNativeCodeGen :: String" >> $(CONFIG_HS)