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.

1 files changed, 3 insertions, 6 deletions

diff --git a/src/libstd/build.rs b/src/libstd/build.rs
index 06f11c8deb4..8a28105ff81 100644
--- a/src/libstd/build.rs
+++ b/src/libstd/build.rs
@@ -14,7 +14,7 @@ extern crate build_helper;
 
 use std::env;
 use std::process::Command;
-use build_helper::{run, native_lib_boilerplate, BuildExpectation};
+use build_helper::{run, native_lib_boilerplate};
 
 fn main() {
     let target = env::var("TARGET").expect("TARGET was not set");
@@ -91,14 +91,11 @@ fn build_libbacktrace(host: &str, target: &str) -> Result<(), ()> {
                 .arg("--disable-host-shared")
                 .arg(format!("--host={}", build_helper::gnu_target(target)))
                 .arg(format!("--build={}", build_helper::gnu_target(host)))
-                .env("CFLAGS", env::var("CFLAGS").unwrap_or_default() + " -fvisibility=hidden"),
-        BuildExpectation::None);
+                .env("CFLAGS", env::var("CFLAGS").unwrap_or_default() + " -fvisibility=hidden"));
 
     run(Command::new(build_helper::make(host))
                 .current_dir(&native.out_dir)
                 .arg(format!("INCDIR={}", native.src_dir.display()))
-                .arg("-j").arg(env::var("NUM_JOBS").expect("NUM_JOBS was not set")),
-        BuildExpectation::None);
-
+                .arg("-j").arg(env::var("NUM_JOBS").expect("NUM_JOBS was not set")));
     Ok(())
 }