From 2ad7a77f0adae2fa2f168dad47dd87a631a57d58 Mon Sep 17 00:00:00 2001 From: Moritz Kiefer Date: Sat, 29 Sep 2018 16:44:41 +0200 Subject: [PATCH] Update docker image to LLVM 7.0 and reenable llvm-hs --- build-constraints.yaml | 2 +- debian-bootstrap.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 7a8406a1..1d98dc52 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -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 diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index bfd3f4c0..308becc8 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -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