@@ -20,12 +20,7 @@ apt-get install -y software-properties-common
2020
2121add-apt-repository ppa:hvr/ghc -y
2222add-apt-repository -y ppa:marutter/rrutter
23−# not sure what this was needed for
24−#add-apt-repository -y ppa:openstack-ubuntu-testing/icehouse
25−#wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
26−add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main"
2723
28−# Set the GHC version
2924GHCVER=8.0.2
3025
3126apt-get update
@@ -113,7 +108,6 @@ apt-get install -y \
113108 libzip-dev \
114109 libzmq3-dev \
115110 llvm-3.7 \
116− llvm-4.0 \
117111 locales \
118112 m4 \
119113 nettle-dev \
@@ -181,3 +175,9 @@ cd /tmp \
181175# Add JDK to system paths.
182176echo "/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/" > /etc/ld.so.conf.d/openjdk.conf \
183177 && ldconfig
178+
179+# llvm-4.0 for llvm-hs (separate since it needs wget)
180+wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
181+add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main"
182+apt-get update
183+apt-get install llvm-4.0