diff options
Diffstat (limited to 'standalone/windows')
| -rwxr-xr-x | standalone/windows/build-simple.sh | 9 | ||||
| -rwxr-xr-x | standalone/windows/build.sh | 9 |
2 files changed, 2 insertions, 16 deletions
diff --git a/standalone/windows/build-simple.sh b/standalone/windows/build-simple.sh index 209758aff..eaa6d1f90 100755 --- a/standalone/windows/build-simple.sh +++ b/standalone/windows/build-simple.sh @@ -25,14 +25,5 @@ cabal install --only-dependencies || true # Build git-annex withcyg cabal configure withcyg cabal build || true - -# Works around link failure https://ghc.haskell.org/trac/ghc/ticket/8596 -# using a response file. ghc --make Build/EvilLinker Build/EvilLinker - -#withcyg rm -f build.log gcc.opt -#withcyg cabal build --ghc-options='-v -keep-tmp-files' > build.log 2>&1 || true -#withcyg grep 'dist\\build\\git-annex\\git-annex.exe' build.log | withcyg grep -v Linking | withcyg sed -e 's/^"[^"]*" //' -e 's/\\/\//g' > gcc.opt -#PATH="$HP/mingw/bin:$PATH" -#gcc @gcc.opt diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh index 9c5636c2f..18a14958e 100755 --- a/standalone/windows/build.sh +++ b/standalone/windows/build.sh @@ -47,13 +47,8 @@ touch last-incremental-failed # Build git-annex withcyg cabal configure withcyg cabal build || true - -# Works around link failure https://ghc.haskell.org/trac/ghc/ticket/8596 -# using a response file. -rm -f build.log gcc.opt -withcyg cabal build --ghc-options='-v -keep-tmp-files' > build.log 2>&1 || true -grep '"dist\\build\\git-annex\\git-annex.exe"' build.log | sed -e 's/^"[^"]*" //' -e 's/\\/\//g' > gcc.opt -"$HP/mingw/bin/gcc.exe" @gcc.opt +ghc --make Build/EvilLinker +Build/EvilLinker # Build the installer cabal install nsis |