summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-12-09 15:38:57 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-12-09 15:38:57 -0400
commit4272f39f126daef7621f0c922eb00084c994abc6 (patch)
treee361821e9df181fac6b9a3d74ec0430e40e18cf0
parentce5bbf184c167aa7b7aec20cb9447263a49bc294 (diff)
avoid using EvilLinker when regular cabal build succeeds
-rwxr-xr-xstandalone/windows/build-simple.sh7
-rwxr-xr-xstandalone/windows/build.sh9
2 files changed, 9 insertions, 7 deletions
diff --git a/standalone/windows/build-simple.sh b/standalone/windows/build-simple.sh
index 0da8e23d7..f00a58b0c 100755
--- a/standalone/windows/build-simple.sh
+++ b/standalone/windows/build-simple.sh
@@ -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
diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh
index 730c99858..e6f7b7e9e 100755
--- a/standalone/windows/build.sh
+++ b/standalone/windows/build.sh
@@ -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