Only use STAGE3_PACKAGE_CONF for building GHC itself

In particular, when building dph with the stage2 compiler, we want to
register it in the main package.conf.

diff --git a/compiler/Makefile b/compiler/Makefile
index fd6afb1..de9ce9a 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

diff --git a/ghc/Makefile b/ghc/Makefile
index 29ca7a8..ed7d24b 100644 (file)
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -83,6 +83,7 @@ CONFIGURE_FLAGS_STAGE3 = $(CONFIGURE_FLAGS_STAGE2PLUS)
 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)
 
 CONFIGURE_FLAGS_STAGE1 += $(foreach flag, $(GhcStage1HcOpts), --ghc-option=$(flag))
 CONFIGURE_FLAGS_STAGE2 += $(foreach flag, $(GhcStage2HcOpts), --ghc-option=$(flag))

diff --git a/mk/cabal-flags.mk b/mk/cabal-flags.mk
index a581582..253a1e3 100644 (file)
--- a/mk/cabal-flags.mk
+++ b/mk/cabal-flags.mk
@@ -89,8 +89,7 @@ USE_STAGE1_CONFIGURE_FLAGS = \
 
 USE_STAGE2_CONFIGURE_FLAGS =            \
     --with-compiler=$(GHC_STAGE2)       \
-    $(USE_STAGE_CONFIGURE_FLAGS)        \
-       --package-db $(STAGE3_PACKAGE_CONF)
+    $(USE_STAGE_CONFIGURE_FLAGS)
 
 BUILD_FLAGS = $(addprefix --ghc-option=,$(SRC_HC_OPTS))