git.iko.soy/stackage
on master help sign in
debian-bootstrap.sh: move llvm-4.0 install to end: needs wget
05ef13aJens Petersen
debian-bootstrap.sh+6−6
compare with master
unifiedsplit
@@ -20,12 +20,7 @@ apt-get install -y software-properties-common
20
20
21add-apt-repository ppa:hvr/ghc -y
21add-apt-repository ppa:hvr/ghc -y
22add-apt-repository -y ppa:marutter/rrutter
22add-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"
27
23
28−# Set the GHC version
29GHCVER=8.0.2
24GHCVER=8.0.2
30
25
31apt-get update
26apt-get update
@@ -113,7 +108,6 @@ apt-get install -y \
113 libzip-dev \
108 libzip-dev \
114 libzmq3-dev \
109 libzmq3-dev \
115 llvm-3.7 \
110 llvm-3.7 \
116− llvm-4.0 \
117 locales \
111 locales \
118 m4 \
112 m4 \
119 nettle-dev \
113 nettle-dev \
@@ -181,3 +175,9 @@ cd /tmp \
181# Add JDK to system paths.
175# Add JDK to system paths.
182echo "/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/" > /etc/ld.so.conf.d/openjdk.conf \
176echo "/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/" > /etc/ld.so.conf.d/openjdk.conf \
183 && ldconfig
177 && 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