Fix Trac #2584: Pretty printing of types with HsDocTy

[ghc-hetmet.git] / utils / installPackage / Makefile

diff --git a/utils/installPackage/Makefile b/utils/installPackage/Makefile
index 0f34de9..758442d 100644 (file)
--- a/utils/installPackage/Makefile
+++ b/utils/installPackage/Makefile
@@ -3,3 +3,11 @@ TOP=../..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/cabal.mk
 
+# If the bootstrapping compiler already has a newer version of Cabal
+# than the in-tree Cabal, then we need to forcibly use the in-tree one.
+# Otherwise we use one Cabal for some things and the other Cabal for
+# other things, and Cabal (rightly) complains about the version
+# mismatch.
+EXTRA_INPLACE_CONFIGURE_FLAGS += $(CABAL_CONSTRAINT)
+EXTRA_STAGE2_CONFIGURE_FLAGS  += $(CABAL_CONSTRAINT)
+