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 /libraries/Makefile | |
| 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 'libraries/Makefile')
| -rw-r--r-- | libraries/Makefile | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libraries/Makefile b/libraries/Makefile index ce28841320..b0179cae31 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -120,9 +120,6 @@ ifeq "$(ghc_ge_605)" "NO" CABAL_GHC_FLAGS += -cpp endif -# Euch, hideous hack: -CABAL_VERSION = $(shell grep "^Version:" Cabal/Cabal.cabal | sed -e "s/^Version: //" -e 's/\./,/g') - BOOTSTRAPPING_FLAGS = $(CABAL_GHC_FLAGS) -DCABAL_VERSION=$(CABAL_VERSION) -odir $(HERE_ABS)/bootstrapping -hidir $(HERE_ABS)/bootstrapping -i$(HERE_ABS)/Cabal -i$(HERE_ABS)/filepath -i$(HERE_ABS)/hpc .PHONY: boot |