on master help sign in
Update everything to ghc 8.8.1
commit25d0709d559ecde2694bfc1309173f99d41680cb authorDan Burton <danburton.email@gmail.com> dateWed 25 Sep 2019, 16:35 (7 years ago) parent62242e1
3 files changed+8−8
Dockerfile+1−1 debian-bootstrap.sh+6−6 etc/ci-script.sh+1−1
Dockerfile+1−1
@@ -2,7 +2,7 @@ FROM fpco/pid1:18.04
22
33ENV HOME /home/stackage
44ENV LANG en_US.UTF-8
5−ENV GHCVER 8.6.5
5+ENV GHCVER 8.8.1
66
77# NOTE: also update debian-bootstrap.sh when cuda version changes
88ENV PATH /home/stackage/.stack/programs/x86_64-linux/ghc-$GHCVER/bin:/usr/local/cuda-10.0/bin:/usr/sbin:/usr/bin:/sbin:/bin
debian-bootstrap.sh+6−6
@@ -131,7 +131,7 @@ apt-get install -y \
131131 libzip-dev \
132132 libzstd-dev \
133133 libzmq3-dev \
134− llvm-6.0 \
134+ llvm-7.0 \
135135 llvm-8 \
136136 locales \
137137 m4 \
@@ -183,9 +183,9 @@ update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.bfd" 10
183183# This version is tracked here:
184184# https://ghc.haskell.org/trac/ghc/wiki/Commentary/Compiler/Backends/LLVM/Installing
185185#
186−# GHC 8.6 requires LLVM 6.0 tools (specifically, llc-6.0 and opt-6.0).
187−update-alternatives --install "/usr/bin/llc" "llc" "/usr/bin/llc-6.0" 50
188−update-alternatives --install "/usr/bin/opt" "opt" "/usr/bin/opt-6.0" 50
186+# GHC 8.8 requires LLVM 7.0 tools (?) (specifically, llc-7.0 and opt-7.0).
187+update-alternatives --install "/usr/bin/llc" "llc" "/usr/bin/llc-7.0" 50
188+update-alternatives --install "/usr/bin/opt" "opt" "/usr/bin/opt-7.0" 50
189189
190190# nodejs 10 (nodejs8 in bionic needs conflicting libssl10-dev)
191191curl -sL https://deb.nodesource.com/setup_10.x | bash -
@@ -257,8 +257,8 @@ apt-add-repository multiverse \
257257 && apt-get update \
258258 && apt-get install -y nvidia-cuda-dev
259259
260−export CLANG_PURE_LLVM_LIB_DIR=/usr/lib/llvm-6.0/lib;
261−export CLANG_PURE_LLVM_INCLUDE_DIR=/usr/lib/llvm-6.0/include;
260+export CLANG_PURE_LLVM_LIB_DIR=/usr/lib/llvm-7.0/lib;
261+export CLANG_PURE_LLVM_INCLUDE_DIR=/usr/lib/llvm-7.0/include;
262262
263263# protoc, for proto-lens-combinators test suite
264264# Instructions from: https://google.github.io/proto-lens/installing-protoc.html
etc/ci-script.sh+1−1
@@ -2,7 +2,7 @@
22
33set -euxo pipefail
44
5−export GHCVER=8.6.5
5+export GHCVER=8.8.1
66
77# Download and unpack the stack executable
88mkdir -p ~/.local/bin