diff options
| author | Corey Farwell <coreyf@rwell.org> | 2016-08-31 19:10:24 -0400 |
|---|---|---|
| committer | Corey Farwell <coreyf@rwell.org> | 2016-09-02 12:48:55 -0400 |
| commit | 3a96fe32753f0308002e18d165f52d54e5ac64cb (patch) | |
| tree | 02fe85b7e93982f9a2967064d8157f1c542846b1 | |
| parent | 824000aee3b9fd594a3da3eb38462fa341f0fa81 (diff) | |
| download | rust-3a96fe32753f0308002e18d165f52d54e5ac64cb.tar.gz rust-3a96fe32753f0308002e18d165f52d54e5ac64cb.zip | |
Transition Travis CI to use rustbuild.
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | src/bootstrap/compile.rs | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 0abd858d822..c5d8a94f39b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,9 +15,9 @@ before_install: script: - docker run -v `pwd`:/build rust sh -c " - ./configure --llvm-root=/usr/lib/llvm-3.7 && + ./configure --enable-rustbuild --llvm-root=/usr/lib/llvm-3.7 && make tidy && - make check-notidy -j4 + make check -j4 " # Real testing happens on http://buildbot.rust-lang.org/ diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index 155848901cd..302ac68460c 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -203,6 +203,10 @@ pub fn rustc<'a>(build: &'a Build, target: &str, compiler: &Compiler<'a>) { cargo.env("LLVM_RUSTLLVM", "1"); } cargo.env("LLVM_CONFIG", build.llvm_config(target)); + let target_config = build.config.target_config.get(target); + if let Some(s) = target_config.and_then(|c| c.llvm_config.as_ref()) { + cargo.env("CFG_LLVM_ROOT", s); + } if build.config.llvm_static_stdcpp { cargo.env("LLVM_STATIC_STDCPP", compiler_file(build.cxx(target), "libstdc++.a")); |