Fix the stage3 build

[ghc-hetmet.git] / mk / cabal-flags.mk

diff --git a/mk/cabal-flags.mk b/mk/cabal-flags.mk
index 4483dc6..4e61c66 100644 (file)
--- 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.
@@ -56,16 +57,17 @@ INSTALL_DIRS_CONFIGURE_FLAGS = \
     --libdir=$(NONEXISTENT) \
     --libexecdir=$(NONEXISTENT) \
     --datadir=$(NONEXISTENT) \
-    --datasubdir=. \
     --docdir=$(NONEXISTENT) \
     --haddockdir=$(NONEXISTENT) \
     --htmldir=$(NONEXISTENT)
 
-INPLACE_DIRS_CONFIGURE_FLAGS = \
-    --prefix=`$(FPTOOLS_TOP_ABS)/utils/pwd/pwd forwardslash`/install-inplace \
+INPLACE_GHC_DATADIR_CONFIGURE_FLAGS = \
     --datadir=$(FPTOOLS_TOP_ABS)/inplace-datadir \
     --datasubdir=.
 
+INPLACE_DIRS_CONFIGURE_FLAGS = \
+    --prefix=`$(FPTOOLS_TOP_ABS)/utils/pwd/pwd forwardslash`/install-inplace
+
 USE_BOOT_CONFIGURE_FLAGS = \
     --with-compiler=$(GHC) \
     --with-hc-pkg=$(GHC_PKG) \
@@ -80,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))