diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-07-04 15:27:13 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-07-04 15:27:13 +0000 |
| commit | 2fae487a7c2a03cf7a6d650c35ecbc5b584daf2b (patch) | |
| tree | 20bb320a8394cb7c1d820db153bc8b2d1fec442b /libraries/Makefile | |
| parent | e345a13029b7654730a4d8f6be730e8b96812a27 (diff) | |
| download | haskell-2fae487a7c2a03cf7a6d650c35ecbc5b584daf2b.tar.gz | |
Tell the bootstrapping Cabal where ghc-pkg is
Diffstat (limited to 'libraries/Makefile')
| -rw-r--r-- | libraries/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libraries/Makefile b/libraries/Makefile index 20161c9101..14cc369c62 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 $@ |