Update docker image to LLVM 7.0 and reenable llvm-hs

This commit is contained in:
Moritz Kiefer 2018-09-29 16:44:41 +02:00 committed by Mihai Maruseac
parent c08d3307f7
commit 2ad7a77f0a
2 changed files with 4 additions and 4 deletions

View File

@ -4461,7 +4461,7 @@ packages:
- jni < 0
- large-hashable < 0
- libmpd < 0
- llvm-hs < 0
- llvm-hs
- llvm-hs-pretty < 0
- matrix-static < 0
- med-module < 0

View File

@ -174,11 +174,11 @@ wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
&& apt-get update \
&& apt-get install -y llvm-5.0
# llvm-6.0 for llvm-hs (separate since it needs wget)
# llvm-7.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" \
&& add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main" \
&& apt-get update \
&& apt-get install -y llvm-6.0
&& apt-get install -y llvm-7
# Buggy versions of ld.bfd fail to link some Haskell packages:
# https://sourceware.org/bugzilla/show_bug.cgi?id=17689. Gold is