summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-10-25 14:52:08 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-10-25 14:52:08 -0400
commit77092ebc999bb3843fb107d5e57e11b0cf800afe (patch)
tree720a0607a103d0b95a63bc50f2694e1907f8fddd
parent23b2e3e78d18f2a9e8edf429a7a82c50d21933dd (diff)
try to put git for windows first
I think there'a a cygwin git in path confusing things
-rwxr-xr-xstandalone/windows/build.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh
index 397cc86c3..8600fd162 100755
--- a/standalone/windows/build.sh
+++ b/standalone/windows/build.sh
@@ -6,7 +6,7 @@
set -x
set -e
-PATH="/cygdrive/c/Program Files (x86)/NSIS/Bin:/cygdrive/c/Program Files (x86)/NSIS:/usr/local/bin:/usr/bin:$PATH"
+PATH="/cygdrive/c/git/cmd:/cygdrive/c/Program Files (x86)/NSIS/Bin:/cygdrive/c/Program Files (x86)/NSIS:/usr/local/bin:/usr/bin:$PATH"
# Run a command with the cygwin environment available.
# However, programs not from cygwin are preferred.
@@ -60,7 +60,7 @@ getextra rsync.exe 85cb7a4d16d274fcf8069b39042965ad26abd6aa
# configure scripts for haskell libraries to link them with the cygwin
# libraries.
stack setup --stack-yaml stack-windows.yaml
-stack build -j 1 --stack-yaml stack-windows.yaml --work-dir .stack-work --no-haddock --dependencies-only
+stack build -j 1 --stack-yaml stack-windows.yaml --no-haddock --dependencies-only
# Build git-annex
withcyg stack build --stack-yaml stack-windows.yaml