diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-12-09 15:38:57 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-12-09 15:38:57 -0400 |
| commit | 4272f39f126daef7621f0c922eb00084c994abc6 (patch) | |
| tree | e361821e9df181fac6b9a3d74ec0430e40e18cf0 | |
| parent | ce5bbf184c167aa7b7aec20cb9447263a49bc294 (diff) | |
avoid using EvilLinker when regular cabal build succeeds
| -rwxr-xr-x | standalone/windows/build-simple.sh | 7 | ||||
| -rwxr-xr-x | standalone/windows/build.sh | 9 |
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 |