diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-12-03 12:32:08 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-12-03 12:32:08 +0000 |
| commit | a7ccc4e6878c9256d4634a91776f2f09ad60b117 (patch) | |
| tree | 44992c5dab131d504c2b712997da165da01d176f /mk | |
| parent | 74f14cbc3c51135809977b29427c7c6a2af2cc34 (diff) | |
| download | haskell-a7ccc4e6878c9256d4634a91776f2f09ad60b117.tar.gz | |
We need to tell cabal-bin which version of Cabal to use
Otherwise, if the bootstrapping compiler has a newer version, we get
a mismatch between the version used to compile ghc-prim's Setup.hs and
the version that installPackage uses.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/cabal-flags.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mk/cabal-flags.mk b/mk/cabal-flags.mk index bfa11a84b0..e1ef084b46 100644 --- a/mk/cabal-flags.mk +++ b/mk/cabal-flags.mk @@ -7,7 +7,7 @@ GHC_PKG_INSTALL_PROG = $(FPTOOLS_TOP_ABS)/utils/ghc-pkg/dist-install/build/ghc-p 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 |