diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-10-03 07:38:45 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-10-03 07:38:45 -0700 |
| commit | 4b6733ec88df49f1af162a1ac6ab56502fecdfb5 (patch) | |
| tree | d7ea3292ee4e60faf91b0e047e0dd7a884f1c430 | |
| parent | 8993a0aebafcdc8e679c4134db5bdf5c01bc229c (diff) | |
| parent | 7b6ecc009c40f97bd93ec158b6efe9449f6aba1d (diff) | |
| download | rust-4b6733ec88df49f1af162a1ac6ab56502fecdfb5.tar.gz rust-4b6733ec88df49f1af162a1ac6ab56502fecdfb5.zip | |
rollup merge of #17741 : alexcrichton/travis-again
| -rw-r--r-- | .travis.yml | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 5bcdafb30eb..26199005298 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,13 +3,6 @@ # downloads a rust/cargo snapshot, which we don't really want for building rust. language: c -# Make sure we've got an up-to-date g++ compiler to get past the LLVM configure -# script. -install: - - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - - sudo apt-get update -qq - - sudo apt-get install g++-4.7 - # The test suite is in general way too stressful for travis, especially in # terms of time limit and reliability. In the past we've tried to scale things # back to only build the stage1 compiler and run a subset of tests, but this @@ -18,7 +11,7 @@ install: # As a result, we're just using travis to run `make tidy` now. It'll help # everyone find out about their trailing spaces early on! before_script: - - ./configure + - ./configure --llvm-root=path/to/nowhere script: - make tidy |