mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 19:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use the clang 3.4 release tarball instead of apt for clang 3.4.

Browse Source 
It appears the llvm.org/apt/ repository isn't always reliable.  So let's
use the release tarball instead.  Also, make using 3.4 conditional, so
we can use the clang 3.3 if things still manage to go awry in the
future.  Note: using 3.3 means that we won't get leak detection.

I left the logic for using llvm.org/apt/, just in case we want try using
it again sometime.
This commit is contained in:
John Szakmeister
2014-03-29 08:12:55 -04:00
parent d9f5cd6290
commit cc9fbd9e55
2 changed files with 58 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
scripts/travis-setup.sh
View File

@@ -1,19 +1,44 @@
#!/bin/sh -e
# Despite the logs, CC isn't being exported at before_install time in Travis.
# So the following check cannot be used to avoid the download.
# [ "$CC" != "clang" ] && exit
add-apt-repository -y ppa:ubuntu-toolchain-r/ppa
wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | apt-key add -
echo "Downloading clang 3.4..."
mkdir /usr/local/clang-3.4
wget -q -O - http://llvm.org/releases/3.4/clang+llvm-3.4-x86_64-unknown-ubuntu12.04.tar.xz |
unxz -c | tar xf - --strip-components=1 -C /usr/local/clang-3.4
cat > /etc/apt/sources.list.d/clang.list << "EOF"
deb http://llvm.org/apt/precise/ llvm-toolchain-precise main
# deb-src http://llvm.org/apt/precise/ llvm-toolchain-precise main
# 3.4
deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.4 main
# deb-src http://llvm.org/apt/precise/ llvm-toolchain-precise-3.4 main
# Common
deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu precise main
EOF
apt-get -qq update
apt-get -qq -y --no-install-recommends install clang-3.4 lldb-3.4
# The section below is still around, in case we want to try the llvm.org/apt/
# repository again.
# Set to true to enable using the clang stable builds hosted at
# http://llvm.org/apt/.
#
# Note: there have been issues with this repository. Several days in a row
# there have been problems running from broken a source repository (causing us
# to remove them from the .list file), to the toolchain being packaged
# incorrectly (most likely due to a change in version number--3.4.0 -> 3.4.1).
# Use with care.
# USE_CLANG_34=true
# if [ -n "$USE_CLANG_34" ]; then
# add-apt-repository -y ppa:ubuntu-toolchain-r/ppa
# wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | apt-key add -
# cat > /etc/apt/sources.list.d/clang.list << "EOF"
# # deb http://llvm.org/apt/precise/ llvm-toolchain-precise main
# # deb-src http://llvm.org/apt/precise/ llvm-toolchain-precise main
# # 3.4
# deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.4 main
# # deb-src http://llvm.org/apt/precise/ llvm-toolchain-precise-3.4 main
# # Common
# deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu precise main
# EOF
# fi
# apt-get -qq update
# [ -n "$USE_CLANG_34" ] &&
# apt-get -qq -y --no-install-recommends install clang-3.4 lldb-3.4