diff options
| -rw-r--r-- | compiler/Makefile | 1 | ||||
| -rw-r--r-- | ghc/Makefile | 1 | ||||
| -rw-r--r-- | mk/cabal-flags.mk | 3 |
3 files changed, 3 insertions, 2 deletions
diff --git a/compiler/Makefile b/compiler/Makefile index fd6afb1c35..de9ce9addd 100644 --- 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 29ca7a821b..ed7d24b643 100644 --- 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 a58158207d..253a1e3f1f 100644 --- 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)) |