Skip to content

Commit bbdaf01

Browse files
committed
travis: Use LLVM 3.3 from the official repos
We can be certain that this version of LLVM will not be changing, so we don't have to worry about API drift over time.
1 parent 1ac5e84 commit bbdaf01

File tree

1 file changed

+9
-18
lines changed

1 file changed

+9
-18
lines changed

.travis.yml

+9-18
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,23 @@
33
# it treats unknown languages as ruby-like I believe.
44
language: c
55

6-
# Before we start doing anything, install the latest stock LLVM. These are
7-
# maintained by LLVM, and more information can be found at llvm.org/apt.
8-
#
9-
# Right now, the highest version is 3.5, and our SVN version is roughly aligned
10-
# with the 3.5 API (hurray!)
6+
# Before we start doing anything, install a stock LLVM
117
install:
12-
- sudo sh -c "echo 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise main' >> /etc/apt/sources.list"
13-
- sudo sh -c "echo 'deb-src http://llvm.org/apt/precise/ llvm-toolchain-precise main' >> /etc/apt/sources.list"
14-
- sudo sh -c "echo 'deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu precise main' >> /etc/apt/sources.list"
15-
- wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
16-
- sudo apt-get update -qq
17-
- sudo apt-get install -y --force-yes -qq llvm-3.5 llvm-3.5-dev clang-3.5 lldb-3.5
8+
- sudo apt-get install llvm-3.3 llvm-3.3-dev clang-3.3 lldb-3.3
189

19-
# All of the llvm tools are suffixed with "-3.5" which we don't want, so symlink
10+
# All of the llvm tools are suffixed with "-3.3" which we don't want, so symlink
2011
# them all into a local directory and just use that
2112
#
2213
# FIXME: this shouldn't update the src/llvm sub-repo, that takes about a minute
2314
# it's gotta download so much stuff.
2415
before_script:
2516
- mkdir -p local-llvm/bin
26-
- ln -nsf /usr/bin/llvm-config-3.5 local-llvm/bin/llvm-config
27-
- ln -nsf /usr/bin/llvm-mc-3.5 local-llvm/bin/llvm-mc
28-
- ln -nsf /usr/bin/llvm-as-3.5 local-llvm/bin/llvm-as
29-
- ln -nsf /usr/bin/llvm-dis-3.5 local-llvm/bin/llvm-dis
30-
- ln -nsf /usr/bin/llc-3.5 local-llvm/bin/llc
31-
- ln -nsf /usr/include/llvm-3.5 local-llvm/include
17+
- ln -nsf /usr/bin/llvm-config-3.3 local-llvm/bin/llvm-config
18+
- ln -nsf /usr/bin/llvm-mc-3.3 local-llvm/bin/llvm-mc
19+
- ln -nsf /usr/bin/llvm-as-3.3 local-llvm/bin/llvm-as
20+
- ln -nsf /usr/bin/llvm-dis-3.3 local-llvm/bin/llvm-dis
21+
- ln -nsf /usr/bin/llc-3.3 local-llvm/bin/llc
22+
- ln -nsf /usr/include/llvm-3.3 local-llvm/include
3223
- ./configure --disable-optimize-tests --llvm-root=`pwd`/local-llvm --enable-fast-make --enable-clang
3324

3425
# Tidy everything up first, then build a few things, and then run a few tests.

0 commit comments

Comments
 (0)