diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-07-22 12:57:43 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-07-22 12:57:43 +0000 |
| commit | 09d76f81a7b77139901a73f9f241d26a5bdd3796 (patch) | |
| tree | 5431221c2e6a6787e15b31bed8272ae44b8e2ebd /mk | |
| parent | 85255a966b21172ce5a26c8a9cb0cdaf7315be95 (diff) | |
| download | haskell-09d76f81a7b77139901a73f9f241d26a5bdd3796.tar.gz | |
Fix the stage3 build
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/cabal-flags.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mk/cabal-flags.mk b/mk/cabal-flags.mk index ae6a6c3c49..4e61c662d8 100644 --- a/mk/cabal-flags.mk +++ b/mk/cabal-flags.mk @@ -7,6 +7,7 @@ UTILS_ABS = $(FPTOOLS_TOP_ABS)/utils CABAL = $(LIBRARIES_ABS)/cabal-bin $(GHC) $(LIBRARIES_ABS)/bootstrapping.conf INSTALL_PACKAGE = \ $(UTILS_ABS)/installPackage/install-inplace/bin/installPackage +STAGE3_PACKAGE_CONF = $(FPTOOLS_TOP_ABS)/stage3.package.conf # We rely on all the CONFIGURE_ARGS being quoted with '...', and there # being no 's inside the values. @@ -81,9 +82,10 @@ USE_STAGE1_CONFIGURE_FLAGS = \ --with-compiler=$(GHC_STAGE1) \ $(USE_STAGE_CONFIGURE_FLAGS) -USE_STAGE2_CONFIGURE_FLAGS = \ - --with-compiler=$(GHC_STAGE2) \ - $(USE_STAGE_CONFIGURE_FLAGS) +USE_STAGE2_CONFIGURE_FLAGS = \ + --with-compiler=$(GHC_STAGE2) \ + $(USE_STAGE_CONFIGURE_FLAGS) \ + --package-db $(STAGE3_PACKAGE_CONF) BUILD_FLAGS = $(addprefix --ghc-option=,$(SRC_HC_OPTS)) |