Get building GHC itself with Cabal more-or-less working

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

diff --git a/mk/cabal-flags.mk b/mk/cabal-flags.mk
index ad01deb..d736679 100644 (file)
--- a/mk/cabal-flags.mk
+++ b/mk/cabal-flags.mk
@@ -3,7 +3,10 @@ nothing=
 space=$(nothing) $(nothing)
 
 LIBRARIES_ABS = $(FPTOOLS_TOP_ABS)/libraries
+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
 
 # We rely on all the CONFIGURE_ARGS being quoted with '...', and there
 # being no 's inside the values.
@@ -35,6 +38,9 @@ endif
 COMMON_CONFIGURE_FLAGS += $(FLAGGED_CONFIGURE_ARGS) \
                           --configure-option=--with-cc=$(CC)
 
+COMMON_CONFIGURE_FLAGS += $(shell [ -e $(HSC2HS_INPLACE) ] && \
+                                  echo --with-hsc2hs=$(HSC2HS_INPLACE) )
+
 ifeq "$(Windows)" "YES"
 NONEXISTENT=c:/NONEXISTENT
 else
@@ -44,7 +50,7 @@ endif
 # We put non-existant paths in when configuring things that we plan to
 # install, as we require that builds don't depend on these paths when
 # making bindists.
-INSTALL_CONFIGURE_FLAGS = \
+INSTALL_DIRS_CONFIGURE_FLAGS = \
     --prefix=$(NONEXISTENT) \
     --bindir=$(NONEXISTENT) \
     --libdir=$(NONEXISTENT) \
@@ -52,18 +58,21 @@ INSTALL_CONFIGURE_FLAGS = \
     --datadir=$(NONEXISTENT) \
     --docdir=$(NONEXISTENT) \
     --haddockdir=$(NONEXISTENT) \
-    --htmldir=$(NONEXISTENT) \
-    --with-compiler=$(FPTOOLS_TOP_ABS)/compiler/stage1/ghc-inplace \
+    --htmldir=$(NONEXISTENT)
+
+INPLACE_DIRS_CONFIGURE_FLAGS = \
+    --prefix=`$(TOP)/utils/pwd/pwd forwardslash`/install-inplace
+
+USE_STAGE1_CONFIGURE_FLAGS = \
+    --with-compiler=$(GHC_STAGE1) \
     --with-hc-pkg=$(FPTOOLS_TOP_ABS)/utils/ghc-pkg/ghc-pkg-inplace \
-    --with-hsc2hs=$(HSC2HS_INPLACE) \
-    $(COMMON_CONFIGURE_FLAGS)
+    $(addprefix --cc-option=,$(MACOSX_DEPLOYMENT_CC_OPTS)) \
+    $(addprefix --ld-option=,$(MACOSX_DEPLOYMENT_LD_OPTS))
 
-INPLACE_CONFIGURE_FLAGS = \
-    --prefix=`$(TOP)/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 \
-    $(COMMON_CONFIGURE_FLAGS)
+       --package-db $(FPTOOLS_TOP_ABS)/libraries/bootstrapping.conf
 
 # XXX
 #    --bindir='$$prefix/bin' \