use EvilLinker on autobuilder (will probably need some more horrible path fixes)

This commit is contained in:
Joey Hess 2013-12-06 15:08:30 -04:00
parent e5a683ae4c
commit b370f52f88
3 changed files with 4 additions and 16 deletions

View file

@ -1,6 +1,8 @@
{- Allows linking haskell programs too big for all the files to fit in a
- command line.
-
- See https://ghc.haskell.org/trac/ghc/ticket/8596
-
- Copyright 2013 Joey Hess <joey@kitenet.net>
-
- Licensed under the GNU GPL version 3 or higher.

View file

@ -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

View file

@ -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