on master help sign in
Update docker image to LLVM 7.0 and reenable llvm-hs
2ad7a77Moritz Kiefer
build-constraints.yaml+1−1
@@ -4461,7 +4461,7 @@ packages:
4461 - jni < 0
4461 - jni < 0
4462 - large-hashable < 0
4462 - large-hashable < 0
4463 - libmpd < 0
4463 - libmpd < 0
4464− - llvm-hs < 0
4464+ - llvm-hs
4465 - llvm-hs-pretty < 0
4465 - llvm-hs-pretty < 0
4466 - matrix-static < 0
4466 - matrix-static < 0
4467 - med-module < 0
4467 - med-module < 0
debian-bootstrap.sh+3−3
@@ -174,11 +174,11 @@ wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
174 && apt-get update \
174 && apt-get update \
175 && apt-get install -y llvm-5.0
175 && apt-get install -y llvm-5.0
176
176
177−# llvm-6.0 for llvm-hs (separate since it needs wget)
177+# llvm-7.0 for llvm-hs (separate since it needs wget)
178wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
178wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
179− && add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main" \
179+ && add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main" \
180 && apt-get update \
180 && apt-get update \
181− && apt-get install -y llvm-6.0
181+ && apt-get install -y llvm-7
182
182
183# Buggy versions of ld.bfd fail to link some Haskell packages:
183# Buggy versions of ld.bfd fail to link some Haskell packages:
184# https://sourceware.org/bugzilla/show_bug.cgi?id=17689. Gold is
184# https://sourceware.org/bugzilla/show_bug.cgi?id=17689. Gold is