a06ca15 · stackage · git.iko.soy

git.iko.soy/stackage

on master help sign in

Merge pull request #3371 from cocreature/llvm-hs-6.0

a06ca15Dan Burton9 years ago

build-constraints.yaml−1

@@ -3755,7 +3755,6 @@ packages:

3755 - pipes-fluid < 0 # GHC 8.4 via lifted-async

3756 - quickcheck-state-machine < 0 # GHC 8.4 via lifted-async

3757 - shelly < 0 # GHC 8.4 via lifted-async

3758− - llvm-hs < 0 # GHC 8.4 via llvm-hs-pure

3759 - lzma-conduit < 0 # GHC 8.4 via lzma

3758 - lzma-conduit < 0 # GHC 8.4 via lzma

3760 - zim-parser < 0 # GHC 8.4 via lzma

3759 - zim-parser < 0 # GHC 8.4 via lzma

3761 - heist < 0 # GHC 8.4 via map-syntax

3760 - heist < 0 # GHC 8.4 via map-syntax

debian-bootstrap.sh+7−1

@@ -156,12 +156,18 @@ curl -sSL https://get.haskellstack.org/ | sh

156# Put documentation where we expect it

157mv /opt/ghc/$GHCVER/share/doc/ghc-$GHCVER/ /opt/ghc/$GHCVER/share/doc/ghc

158

159−# llvm-5.0 for llvm-hs (separate since it needs wget)

159+# llvm-5.0 for GHC (separate since it needs wget)

160wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \

161 && add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main" \

162 && apt-get update \

163 && apt-get install -y llvm-5.0

164

165+# llvm-6.0 for llvm-hs (separate since it needs wget)

166+wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \

167+ && add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main" \

168+ && apt-get update \

169+ && apt-get install -y llvm-6.0

170+

165# Buggy versions of ld.bfd fail to link some Haskell packages:

171# Buggy versions of ld.bfd fail to link some Haskell packages:

166# https://sourceware.org/bugzilla/show_bug.cgi?id=17689. Gold is

172# https://sourceware.org/bugzilla/show_bug.cgi?id=17689. Gold is

167# faster anyways and uses less RAM.

173# faster anyways and uses less RAM.