diff options
| author | kennytm <kennytm@gmail.com> | 2017-12-07 05:06:48 +0800 |
|---|---|---|
| committer | kennytm <kennytm@gmail.com> | 2017-12-27 00:00:45 +0800 |
| commit | 2566fa25c7fefbd61e4251bda4407747a3023891 (patch) | |
| tree | 981d391ca169cbf67f886f56f79c5dd55887d0b2 /src/liballoc_jemalloc | |
| parent | 519f92f2aa7f2ec6833c57460283784a5077f73e (diff) | |
| download | rust-2566fa25c7fefbd61e4251bda4407747a3023891.tar.gz rust-2566fa25c7fefbd61e4251bda4407747a3023891.zip | |
Revert "Add a file to trivially disable tool building or testing"
This reverts commit ab018c76e14b87f3c9e0b7384cc9b02d94779cd5. This also adds the `ToolBuild::is_ext_tool` field to replace the previous `ToolBuild::expectation` field, to indicate whether a build-failure of certain tool is essential.
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 de5006ad396..649cd6e8e85 100644 --- a/src/liballoc_jemalloc/build.rs +++ b/src/liballoc_jemalloc/build.rs @@ -16,7 +16,7 @@ extern crate cc; use std::env; use std::path::PathBuf; use std::process::Command; -use build_helper::{run, native_lib_boilerplate, BuildExpectation}; +use build_helper::{run, native_lib_boilerplate}; fn main() { // FIXME: This is a hack to support building targets that don't @@ -113,7 +113,7 @@ fn main() { cmd.arg("--with-lg-quantum=4"); } - run(&mut cmd, BuildExpectation::None); + run(&mut cmd); let mut make = Command::new(build_helper::make(&host)); make.current_dir(&native.out_dir) @@ -130,7 +130,7 @@ fn main() { .arg(env::var("NUM_JOBS").expect("NUM_JOBS was not set")); } - run(&mut make, BuildExpectation::None); + run(&mut make); // 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 |
