use EvilLinker on autobuilder (will probably need some more horrible path fixes)
This commit is contained in:
parent
e5a683ae4c
commit
b370f52f88
3 changed files with 4 additions and 16 deletions
|
@ -1,6 +1,8 @@
|
||||||
{- Allows linking haskell programs too big for all the files to fit in a
|
{- Allows linking haskell programs too big for all the files to fit in a
|
||||||
- command line.
|
- command line.
|
||||||
-
|
-
|
||||||
|
- See https://ghc.haskell.org/trac/ghc/ticket/8596
|
||||||
|
-
|
||||||
- Copyright 2013 Joey Hess <joey@kitenet.net>
|
- Copyright 2013 Joey Hess <joey@kitenet.net>
|
||||||
-
|
-
|
||||||
- Licensed under the GNU GPL version 3 or higher.
|
- Licensed under the GNU GPL version 3 or higher.
|
||||||
|
|
|
@ -25,14 +25,5 @@ cabal install --only-dependencies || true
|
||||||
# Build git-annex
|
# Build git-annex
|
||||||
withcyg cabal configure
|
withcyg cabal configure
|
||||||
withcyg cabal build || true
|
withcyg cabal build || true
|
||||||
|
|
||||||
# Works around link failure https://ghc.haskell.org/trac/ghc/ticket/8596
|
|
||||||
# using a response file.
|
|
||||||
ghc --make Build/EvilLinker
|
ghc --make Build/EvilLinker
|
||||||
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
|
|
||||||
|
|
|
@ -47,13 +47,8 @@ touch last-incremental-failed
|
||||||
# Build git-annex
|
# Build git-annex
|
||||||
withcyg cabal configure
|
withcyg cabal configure
|
||||||
withcyg cabal build || true
|
withcyg cabal build || true
|
||||||
|
ghc --make Build/EvilLinker
|
||||||
# Works around link failure https://ghc.haskell.org/trac/ghc/ticket/8596
|
Build/EvilLinker
|
||||||
# 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
|
|
||||||
|
|
||||||
# Build the installer
|
# Build the installer
|
||||||
cabal install nsis
|
cabal install nsis
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue