try to use add-apt-repository for the upstream llvm repo

This commit is contained in:
Jens Petersen 2017-03-29 17:43:21 +09:00
parent c0a605d660
commit 2190c7bebf

View File

@ -22,9 +22,8 @@ add-apt-repository ppa:hvr/ghc -y
add-apt-repository -y ppa:marutter/rrutter add-apt-repository -y ppa:marutter/rrutter
# not sure what this was needed for # not sure what this was needed for
#add-apt-repository -y ppa:openstack-ubuntu-testing/icehouse #add-apt-repository -y ppa:openstack-ubuntu-testing/icehouse
wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - #wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
echo "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main" >> /etc/apt/sources.list add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main"
echo "deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main" >> /etc/apt/sources.list
# Set the GHC version # Set the GHC version
GHCVER=8.0.2 GHCVER=8.0.2
@ -114,8 +113,8 @@ apt-get install -y \
libzip-dev \ libzip-dev \
libzmq3-dev \ libzmq3-dev \
llvm-3.7 \ llvm-3.7 \
llvm-4.0 \
locales \ locales \
llvm-4.0-dev \
m4 \ m4 \
nettle-dev \ nettle-dev \
nodejs \ nodejs \