From dca57167ebffc19efa44b42571a8d17860d5531e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 11 Dec 2013 11:23:34 -0400 Subject: update --- standalone/windows/build-simple.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'standalone/windows') 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 -- cgit v1.2.3