X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fcabal-flags.mk;h=e1ef084b46c124fff4d267bcb592276dd10b8fba;hb=40fcfe10c97edf2981031f1a8450bb82ba6a8879;hp=2e743574cbe937313d5e62e99f96a163fd9caf7e;hpb=0fd755820053238e8f739356e8ff6420f87119f4;p=ghc-hetmet.git

diff --git a/mk/cabal-flags.mk b/mk/cabal-flags.mk
index 2e74357..e1ef084 100644
--- a/mk/cabal-flags.mk
+++ b/mk/cabal-flags.mk
@@ -1,16 +1,22 @@
 
 nothing=
 space=$(nothing) $(nothing)
+comma=,
 
 GHC_PKG_INSTALL_PROG = $(FPTOOLS_TOP_ABS)/utils/ghc-pkg/dist-install/build/ghc-pkg/ghc-pkg
 
 LIBRARIES_ABS = $(FPTOOLS_TOP_ABS)/libraries
 UTILS_ABS     = $(FPTOOLS_TOP_ABS)/utils
-CABAL = $(LIBRARIES_ABS)/cabal-bin $(GHC) $(LIBRARIES_ABS)/bootstrapping.conf
+CABAL = $(LIBRARIES_ABS)/cabal-bin $(GHC) $(LIBRARIES_ABS)/bootstrapping.conf $(CABAL_DOTTED_VERSION)
 INSTALL_PACKAGE = \
     $(UTILS_ABS)/installPackage/install-inplace/bin/installPackage
 STAGE3_PACKAGE_CONF = $(FPTOOLS_TOP_ABS)/stage3.package.conf
 
+# Euch, hideous hack:
+CABAL_DOTTED_VERSION = $(shell grep "^Version:" $(LIBRARIES_ABS)/Cabal/Cabal.cabal | sed "s/^Version: //")
+CABAL_VERSION = $(subst .,$(comma),$(CABAL_DOTTED_VERSION))
+CABAL_CONSTRAINT = --constraint="Cabal == $(CABAL_DOTTED_VERSION)"
+
 # We rely on all the CONFIGURE_ARGS being quoted with '...', and there
 # being no 's inside the values.
 FLAGGED_CONFIGURE_ARGS = $(subst $(space)',\
@@ -38,7 +44,7 @@ endif
 COMMON_CONFIGURE_FLAGS += $(FLAGGED_CONFIGURE_ARGS) \
                           --configure-option=--with-cc=$(CC)
 
-COMMON_CONFIGURE_FLAGS += $(shell [ -e $(HSC2HS_INPLACE) ] && \
+COMMON_CONFIGURE_FLAGS += $(shell [ -f $(HSC2HS_INPLACE) ] && \
                                   echo --with-hsc2hs=$(HSC2HS_INPLACE) )
 
 ifeq "$(Windows)" "YES"