From 2fae487a7c2a03cf7a6d650c35ecbc5b584daf2b Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Fri, 4 Jul 2008 15:27:13 +0000 Subject: [PATCH] Tell the bootstrapping Cabal where ghc-pkg is --- libraries/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/Makefile b/libraries/Makefile index 20161c9..14cc369 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -192,11 +192,11 @@ cabal-bin: cabal-bin.hs bootstrapping.conf: cabal-bin echo "[]" > $@.tmp -cd filepath && $(CABAL) clean --distpref=dist-bootstrapping - cd filepath && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --package-db=$(HERE_ABS)/$@.tmp + cd filepath && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp cd filepath && $(CABAL) build --distpref=dist-bootstrapping cd filepath && $(CABAL) install --distpref=dist-bootstrapping --inplace -cd Cabal && $(CABAL) clean --distpref=dist-bootstrapping - cd Cabal && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --package-db=$(HERE_ABS)/$@.tmp + cd Cabal && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp cd Cabal && $(CABAL) build --distpref=dist-bootstrapping cd Cabal && $(CABAL) install --distpref=dist-bootstrapping --inplace mv $@.tmp $@ -- 1.7.10.4