travis: Fix for real this time

I ended up botching the merge when making the rollup, and the fix was to just
not configure LLVM all via --llvm-root with a nonexistent path.
This commit is contained in:
Alex Crichton 2014-10-03 07:25:10 -07:00
parent 9a2286d3a1
commit 7b6ecc009c

View File

@ -3,13 +3,6 @@
# downloads a rust/cargo snapshot, which we don't really want for building rust. # downloads a rust/cargo snapshot, which we don't really want for building rust.
language: c 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 # 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 # 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 # 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 # 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! # everyone find out about their trailing spaces early on!
before_script: before_script:
- ./configure - ./configure --llvm-root=path/to/nowhere
script: script:
- make tidy - make tidy