mirror of
https://github.com/commercialhaskell/stackage.git
synced 2026-01-11 23:08:30 +01:00
Install LLVM 6.0 in docker image and reenable llvm-hs
This commit is contained in:
parent
ebc153aaba
commit
ca9b62cd56
@ -3755,7 +3755,6 @@ packages:
|
||||
- pipes-fluid < 0 # GHC 8.4 via lifted-async
|
||||
- quickcheck-state-machine < 0 # GHC 8.4 via lifted-async
|
||||
- shelly < 0 # GHC 8.4 via lifted-async
|
||||
- llvm-hs < 0 # GHC 8.4 via llvm-hs-pure
|
||||
- lzma-conduit < 0 # GHC 8.4 via lzma
|
||||
- zim-parser < 0 # GHC 8.4 via lzma
|
||||
- heist < 0 # GHC 8.4 via map-syntax
|
||||
|
||||
@ -156,12 +156,18 @@ curl -sSL https://get.haskellstack.org/ | sh
|
||||
# Put documentation where we expect it
|
||||
mv /opt/ghc/$GHCVER/share/doc/ghc-$GHCVER/ /opt/ghc/$GHCVER/share/doc/ghc
|
||||
|
||||
# llvm-5.0 for llvm-hs (separate since it needs wget)
|
||||
# llvm-5.0 for GHC (separate since it needs wget)
|
||||
wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
|
||||
&& add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main" \
|
||||
&& apt-get update \
|
||||
&& apt-get install -y llvm-5.0
|
||||
|
||||
# llvm-6.0 for llvm-hs (separate since it needs wget)
|
||||
wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
|
||||
&& add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main" \
|
||||
&& apt-get update \
|
||||
&& apt-get install -y llvm-6.0
|
||||
|
||||
# Buggy versions of ld.bfd fail to link some Haskell packages:
|
||||
# https://sourceware.org/bugzilla/show_bug.cgi?id=17689. Gold is
|
||||
# faster anyways and uses less RAM.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user