Commit 2fae487a authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Tell the bootstrapping Cabal where ghc-pkg is

parent e345a130
...@@ -192,11 +192,11 @@ cabal-bin: cabal-bin.hs ...@@ -192,11 +192,11 @@ cabal-bin: cabal-bin.hs
bootstrapping.conf: cabal-bin bootstrapping.conf: cabal-bin
echo "[]" > $@.tmp echo "[]" > $@.tmp
-cd filepath && $(CABAL) clean --distpref=dist-bootstrapping -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) build --distpref=dist-bootstrapping
cd filepath && $(CABAL) install --distpref=dist-bootstrapping --inplace cd filepath && $(CABAL) install --distpref=dist-bootstrapping --inplace
-cd Cabal && $(CABAL) clean --distpref=dist-bootstrapping -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) build --distpref=dist-bootstrapping
cd Cabal && $(CABAL) install --distpref=dist-bootstrapping --inplace cd Cabal && $(CABAL) install --distpref=dist-bootstrapping --inplace
mv $@.tmp $@ mv $@.tmp $@
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment