diff options
| author | bors <bors@rust-lang.org> | 2017-12-26 18:03:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-12-26 18:03:00 +0000 |
| commit | 503153e9506890c31749768474506e0b4e3eb4ef (patch) | |
| tree | 1bdfae1215771ca33d110a887528425f84f6493a /src/liballoc_jemalloc | |
| parent | 269827ced91bb2b702d4cb62e3e164b225f73157 (diff) | |
| parent | 44954ab52d82fe5ae5222c3bfd482d38c3db0baa (diff) | |
| download | rust-503153e9506890c31749768474506e0b4e3eb4ef.tar.gz rust-503153e9506890c31749768474506e0b4e3eb4ef.zip | |
Auto merge of #46554 - kennytm:45861-step-4-5-6-7-upload-test-result-and-remove-toolstate-toml, r=alexcrichton
[auto-toolstate] Upload the toolstate result to an external git repository, and removes BuildExpectation This PR consists of 3 commits. 1. (Steps 4–6) The `toolstate.json` output previously collected is now pushed to the https://github.com/rust-lang-nursery/rust-toolstate repository. 2. (Step 7) Revert commit ab018c7, thus removing all traces of `BuildExpectation` and `toolstate.toml`. 3. (Step 8) Adjust CONTRIBUTION.md for the new procedure. These are the last steps of #45861. After this PR, the toolstate will be automatically computed and published to https://rust-lang-nursery.github.io/rust-toolstate/. There is no need to manage toolstate.toml again. Closes #45861.
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 |
