From c30fae635e4ed8b76b7e36d989ebdb917708686b Mon Sep 17 00:00:00 2001 From: Moritz Kiefer Date: Sun, 10 Sep 2017 07:52:19 +0200 Subject: [PATCH] Switch to LLVM 5 and remove constraints on llvm-hs and llvm-hs-pure --- build-constraints.yaml | 4 ---- debian-bootstrap.sh | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index de8ec985..454646a5 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3379,10 +3379,6 @@ packages: # https://github.com/fpco/stackage/issues/2832 - io-streams < 1.5 - # https://github.com/llvm-hs/llvm-hs/issues/137 - - llvm-hs < 5.0.0 - - llvm-hs-pure == 4.1.0.0 - # end of packages # Package flags are applied to individual packages, and override the values of diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index d294a690..b9a6feaa 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -191,9 +191,9 @@ echo "/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/" > /etc/ld.so.conf # llvm-4.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-4.0 main" \ + && add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main" \ && apt-get update \ - && apt-get install -y llvm-4.0 + && apt-get install -y llvm-5.0 # Install version 3 of the protobuf compiler. (The `protobuf-compiler` package only # supports version 2.)