From 90cb03edb514782ef149e0a9b57a4d3063cc7e47 Mon Sep 17 00:00:00 2001 From: Moritz Kiefer Date: Wed, 11 Sep 2019 20:36:47 +0200 Subject: [PATCH] Install LLVM 9.0 in the docker image and upgrade llvm-hs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixes #4812 I’m very sorry for the broken earlier attempt in #4813. This time I’ve built the full docker image and did the `stack unpack; stack build …` dance in the docker image so hopefully I didn’t screw it up again. --- build-constraints.yaml | 4 ---- debian-bootstrap.sh | 6 ++++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 97e07d6a..aa00b4bc 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4826,10 +4826,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/4809 - elm-street < 0.1 - # https://github.com/commercialhaskell/stackage/issues/4812 - - llvm-hs < 9 - - llvm-hs-pure < 9 - # https://github.com/commercialhaskell/stackage/issues/4816 - trifecta < 2.1 diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index b12ae29e..0e2ce841 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -165,6 +165,12 @@ curl https://packages.microsoft.com/config/debian/9/prod.list > /etc/apt/sources apt-get update ACCEPT_EULA=Y apt-get install msodbcsql17 -y +# llvm for llvm-hs +curl https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - +add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main" +apt-get update +apt-get install llvm-9-dev -y + locale-gen en_US.UTF-8 # Buggy versions of ld.bfd fail to link some Haskell packages: