Define CABAL in mk/cabal-flags.mk, rather than everywhere we use it

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

diff --git a/mk/cabal-flags.mk b/mk/cabal-flags.mk
index 1d63e1a..9b2ed2a 100644 (file)
--- a/mk/cabal-flags.mk
+++ b/mk/cabal-flags.mk
@@ -2,6 +2,9 @@
 nothing=
 space=$(nothing) $(nothing)
 
+LIBRARIES_ABS = $(FPTOOLS_TOP_ABS)/libraries
+CABAL = $(LIBRARIES_ABS)/cabal-bin $(GHC) $(LIBRARIES_ABS)/bootstrapping.conf
+
 # We rely on all the CONFIGURE_ARGS being quoted with '...', and there
 # being no 's inside the values.
 FLAGGED_CONFIGURE_ARGS = $(subst $(space)',\
@@ -53,6 +56,7 @@ INPLACE_CONFIGURE_FLAGS = \
     --prefix=`$(TOP)/utils/pwd/pwd forwardslash`/install-inplace \
     --with-compiler=$(GHC) \
     --with-hc-pkg=$(GHC_PKG) \
+       --package-db $(FPTOOLS_TOP_ABS)/libraries/bootstrapping.conf \
     $(COMMON_CONFIGURE_FLAGS)
 
 # XXX