summaryrefslogtreecommitdiff
path: root/standalone/windows/build-simple.sh
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-12-11 11:23:34 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-12-11 11:23:34 -0400
commitdca57167ebffc19efa44b42571a8d17860d5531e (patch)
treede3e8fa0d0d8376e4092aaca93ad9b64865204af /standalone/windows/build-simple.sh
parent17e109d5c29b02be9bc83aa97afb0364c1211c56 (diff)
update
Diffstat (limited to 'standalone/windows/build-simple.sh')
-rwxr-xr-xstandalone/windows/build-simple.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/standalone/windows/build-simple.sh b/standalone/windows/build-simple.sh
index 9b968e621..f62481f32 100755
--- a/standalone/windows/build-simple.sh
+++ b/standalone/windows/build-simple.sh
@@ -16,6 +16,9 @@ PATH="$HP/bin:$HP/lib/extralibs/bin:$PATH"
withcyg () {
PATH="$PATH:/c/cygwin/bin" "$@"
}
+withcygpreferred () {
+ PATH="/c/cygwin/bin:$PATH" "$@"
+}
# Install haskell dependencies.
# cabal install is not run in cygwin, because we don't want configure scripts
@@ -35,4 +38,6 @@ fi
cabal install nsis
ghc --make Build/NullSoftInstaller.hs
PATH="$PATH:/cygdrive/c/Program Files/NSIS"
-withcyg Build/NullSoftInstaller.exe
+# Want to include cygwin programs in bundle, not others, since
+# it includes the cygwin libs that go with them.
+withcygpreferred Build/NullSoftInstaller.exe