mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

avoid using EvilLinker when regular cabal build succeeds

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

3
standalone/windows/build-simple.sh
View file

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

3
standalone/windows/build.sh
View file

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