Skip to content

Commit 0be0c98

Browse files
committed
---
yaml --- r: 104571 b: refs/heads/try c: bbdaf01 h: refs/heads/master i: 104569: fb6f6d2 104567: 2087d0b v: v3
1 parent 4d0cd45 commit 0be0c98

File tree

2 files changed

+10
-19
lines changed

2 files changed

+10
-19
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 62f1d68439dcfd509eaca29887afa97f22938373
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 6e7f170fedd3c526a643c0b2d13863acd982be02
5-
refs/heads/try: 1ac5e84e9179fd9c02b5f8d6c46eaab58baa6e4b
5+
refs/heads/try: bbdaf01a5aa3ef55b693384465e61db1007a9a09
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/.travis.yml

Lines changed: 9 additions & 18 deletions
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)