X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2FinstallPackage%2FMakefile;h=758442dc85e623567816b44e3ce37c531aa5a5f6;hb=5a4c6ef6e909fbd978ff81bb3453489e884d1885;hp=b5659f9c210ef509c32db6a7eb0aff10e147b842;hpb=b1e8c0320d855a0569243f7f88785ef8119b3789;p=ghc-hetmet.git

diff --git a/utils/installPackage/Makefile b/utils/installPackage/Makefile
index b5659f9..758442d 100644
--- a/utils/installPackage/Makefile
+++ b/utils/installPackage/Makefile
@@ -3,7 +3,11 @@ TOP=../..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/cabal.mk
 
-# We should stop installPackage being installed itself, but we do need
-# to build it with the stage1 compiler as we need to use it when
-# installing.
+# 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)