diff options
| author | bors <bors@rust-lang.org> | 2017-09-18 01:50:29 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-09-18 01:50:29 +0000 |
| commit | caad2560bfbd0e2b0e0dcb6882395c1523a1aadc (patch) | |
| tree | 382ef1cea7a7de3e7184782db64c62f861ec6314 /src/liballoc_jemalloc | |
| parent | e8a76d8accf04047a938ba43b32d5ff9ab581715 (diff) | |
| parent | 01555b1da1bb0fb289b1c971a046b315c751c861 (diff) | |
| download | rust-caad2560bfbd0e2b0e0dcb6882395c1523a1aadc.tar.gz rust-caad2560bfbd0e2b0e0dcb6882395c1523a1aadc.zip | |
Auto merge of #43628 - oli-obk:orbital_standard_library, r=alexcrichton
Run the miri test suite on the aux builder and travis Reopen of #38350 see https://github.com/rust-lang/rust/pull/43340#issuecomment-316940762 for earlier discussion Rationale for running miri's test suite in rustc's CI is that miri currently contains many features that we want in const eval in the future, and these features would break if the test suite is not run. fixes #44077 r? @nikomatsakis cc @eddyb
Diffstat (limited to 'src/liballoc_jemalloc')
| -rw-r--r-- | src/liballoc_jemalloc/build.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/liballoc_jemalloc/build.rs b/src/liballoc_jemalloc/build.rs index 1864df4477a..d89d3bcdb62 100644 --- a/src/liballoc_jemalloc/build.rs +++ b/src/liballoc_jemalloc/build.rs @@ -16,7 +16,7 @@ extern crate gcc; use std::env; use std::path::PathBuf; use std::process::Command; -use build_helper::{run, native_lib_boilerplate}; +use build_helper::{run, native_lib_boilerplate, BuildExpectation}; fn main() { // FIXME: This is a hack to support building targets that don't @@ -126,7 +126,7 @@ fn main() { cmd.arg("--with-lg-quantum=4"); } - run(&mut cmd); + run(&mut cmd, BuildExpectation::None); let mut make = Command::new(build_helper::make(&host)); make.current_dir(&native.out_dir) @@ -143,7 +143,7 @@ fn main() { .arg(env::var("NUM_JOBS").expect("NUM_JOBS was not set")); } - run(&mut make); + run(&mut make, BuildExpectation::None); // The pthread_atfork symbols is used by jemalloc on android but the really // old android we're building on doesn't have them defined, so just make |