X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fcabal-flags.mk;h=b50702d0e5458d77c7ae02fe0e65cc2668d4b98e;hb=318f217d3169cdcca74d20c5c4b45721c89bc9cd;hp=d736679de7b7aeaca14b767122df04238a0f9c8e;hpb=9412e62942ebab0599c7fb0b358a9d4869647b67;p=ghc-hetmet.git

diff --git a/mk/cabal-flags.mk b/mk/cabal-flags.mk
index d736679..b50702d 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.
@@ -14,9 +15,10 @@ FLAGGED_CONFIGURE_ARGS = $(subst $(space)',\
                                  $(space)--configure-option=',\
                                  $(space)$(CONFIGURE_ARGS))
 
-COMMON_CONFIGURE_FLAGS = \
-    --libsubdir='$$pkgid' \
-    --with-ld=$(LD) \
+COMMON_CONFIGURE_FLAGS =          \
+    --libsubdir='$$pkgid'         \
+    --with-gcc=$(WhatGccIsCalled) \
+    --with-ld=$(LD)               \
     $(addprefix --hsc2hs-option=,$(SRC_HSC2HS_OPTS))
 
 ifneq "$(HSCOLOUR)" ""
@@ -60,28 +62,31 @@ INSTALL_DIRS_CONFIGURE_FLAGS = \
     --haddockdir=$(NONEXISTENT) \
     --htmldir=$(NONEXISTENT)
 
-INPLACE_DIRS_CONFIGURE_FLAGS = \
-    --prefix=`$(TOP)/utils/pwd/pwd forwardslash`/install-inplace
+INPLACE_GHC_DATADIR_CONFIGURE_FLAGS = \
+    --datadir=$(FPTOOLS_TOP_ABS)/inplace-datadir \
+    --datasubdir=.
 
-USE_STAGE1_CONFIGURE_FLAGS = \
-    --with-compiler=$(GHC_STAGE1) \
-    --with-hc-pkg=$(FPTOOLS_TOP_ABS)/utils/ghc-pkg/ghc-pkg-inplace \
-    $(addprefix --cc-option=,$(MACOSX_DEPLOYMENT_CC_OPTS)) \
-    $(addprefix --ld-option=,$(MACOSX_DEPLOYMENT_LD_OPTS))
+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) \
 	--package-db $(FPTOOLS_TOP_ABS)/libraries/bootstrapping.conf
 
-# XXX
-#    --bindir='$$prefix/bin' \
-#    --libdir='$$prefix/lib' \
-#    --libexecdir='$$prefix/libexec' \
-#    --datadir='$$prefix/data' \
-#    --docdir='$$prefix/doc' \
-#    --haddockdir='$$prefix/haddock' \
-#    --htmldir='$$prefix/html' \
+USE_STAGE_CONFIGURE_FLAGS = \
+    --with-hc-pkg=$(GHC_PKG_INPLACE) \
+    $(addprefix --cc-option=,$(MACOSX_DEPLOYMENT_CC_OPTS)) \
+    $(addprefix --ld-option=,$(MACOSX_DEPLOYMENT_LD_OPTS))
+
+USE_STAGE1_CONFIGURE_FLAGS = \
+    --with-compiler=$(GHC_STAGE1) \
+    $(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))