bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

miri needs to be *built* with RUST_SYSROOT, not *run*

Browse source
This commit is contained in:
Oliver Schneider 2016-06-16 11:00:46 +02:00
parent 2ed6f1c90a
commit f01be91997
No known key found for this signature in database
GPG key ID: 56D6EEA0FC67AC46
2 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -7,7 +7,7 @@ before_script:
export PATH=$HOME/.local/bin:$PATH export PATH=$HOME/.local/bin:$PATH
script: script:
- | - |
travis-cargo build && env RUST_SYSROOT=$HOME/rust travis-cargo build &&
env RUST_SYSROOT=$HOME/rust travis-cargo test env RUST_SYSROOT=$HOME/rust travis-cargo test
notifications: notifications:
email: email:

1
tests/compiletest.rs
View file

@ -63,7 +63,6 @@ fn compile_test() {
cmd.arg(format!("--sysroot={}", sysroot)); cmd.arg(format!("--sysroot={}", sysroot));
cmd.arg("-Dwarnings"); cmd.arg("-Dwarnings");
cmd.arg(format!("--target={}", target)); cmd.arg(format!("--target={}", target));
cmd.env("RUST_SYSROOT", &sysroot);
let libs = Path::new(&sysroot).join("lib"); let libs = Path::new(&sysroot).join("lib");
let sysroot = libs.join("rustlib").join(&target).join("lib"); let sysroot = libs.join("rustlib").join(&target).join("lib");
let paths = std::env::join_paths(&[libs, sysroot]).unwrap(); let paths = std::env::join_paths(&[libs, sysroot]).unwrap();