tools: have cabal use configured GHC version too

This commit is contained in:
Simon Michael 2014-04-19 12:02:20 -07:00
parent 1b6ccc03bc
commit c36244bfe6

View File

@ -29,6 +29,8 @@ PRINT=lpr
GHC=ghc
GHCI=ghci
HADDOCK=haddock
CABAL=cabal
CABALINSTALL=cabal install -w $(GHC)
# used for make auto, http://joyful.com/repos/searchpath
SP=sp
@ -155,7 +157,7 @@ defaulttarget: bin/hledgerdev
# (or, as many as possible)
EXTRAINSTALLARGS=
install:
cabal install $(patsubst %,./%,$(PACKAGES)) $(EXTRAINSTALLARGS)
$(CABALINSTALL) $(patsubst %,./%,$(PACKAGES)) $(EXTRAINSTALLARGS)
# run a cabal command in all hledger package dirs
allcabal%:
@ -449,7 +451,7 @@ fullcabaltest:
&& cd $$p \
&& cabal clean \
&& cabal check \
&& cabal install \
&& $(CABALINSTALL) \
&& cabal sdist \
); done \
&& echo $@ PASSED) || echo $@ FAILED