diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-10-15 14:40:23 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-10-15 14:40:23 +0000 |
| commit | 7c9b541f7f321839ef06f22ebc24b53adc1cea7a (patch) | |
| tree | 5fbe9dff338a92e8fb961b712085256175e32329 /utils | |
| parent | a54b5fa28776951f5f9049f45d7a279558e17439 (diff) | |
| download | haskell-7c9b541f7f321839ef06f22ebc24b53adc1cea7a.tar.gz | |
Fix the build when the bootstrapping compiler has a newer Cabal than us
We need to forcibly use the in-tree Cabal, or we get version mismatch errors
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/installPackage/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/utils/installPackage/Makefile b/utils/installPackage/Makefile index e963060d50..758442dc85 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 stage2 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) |