Merge branch 'master' into nightly
commit89ee925eb35dae8b8e24e54da2bd32319de26aba
authorJens Petersen <juhpetersen@gmail.com>
dateThu 30 Mar 2017, 12:43 (10 years ago)
parent2bbc8a98e73c3f
debian-bootstrap.sh+4−4
@@ -177,7 +177,7 @@ echo "/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/" > /etc/ld.so.conf
177177 && ldconfig
178178
179179# 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
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 -y llvm-4.0