avoid using EvilLinker when regular cabal build succeeds

This commit is contained in:
Joey Hess 2013-12-09 15:38:57 -04:00
parent 15fda7f452
commit c1bf27ecff
2 changed files with 9 additions and 7 deletions

View file

@ -26,6 +26,7 @@ cabal install --only-dependencies || true
if [ ! -e "dist/setup-config" ]; then
withcyg cabal configure
fi
withcyg cabal build || true
ghc --make Build/EvilLinker
withcyg Build/EvilLinker
if ! withcyg cabal build; then
ghc --make Build/EvilLinker
withcyg Build/EvilLinker
fi

View file

@ -46,10 +46,11 @@ touch last-incremental-failed
# Build git-annex
withcyg cabal configure
withcyg cabal build || true
rm -f Build/EvilLinker.exe
ghc --make Build/EvilLinker
Build/EvilLinker
if ! withcyg cabal build; then
rm -f Build/EvilLinker.exe
ghc --make Build/EvilLinker
Build/EvilLinker
fi
# Build the installer
cabal install nsis