From 276557504d20412b46bc5ba2e3463f1ddce73040 Mon Sep 17 00:00:00 2001
From: Christian Poveda <christianpoveda@protonmail.com>
Date: Sun, 30 Sep 2018 12:14:27 -0500
Subject: [PATCH] Fix conditions to allow missing tools in CI

---
 config.toml.example        | 4 ++++
 src/bootstrap/config.rs    | 2 ++
 src/bootstrap/configure.py | 2 +-
 src/ci/run.sh              | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/config.toml.example b/config.toml.example
index 66eaab236f7c0..312270532affc 100644
--- a/config.toml.example
+++ b/config.toml.example
@@ -481,3 +481,7 @@
 # as the one built on Windows will contain backslashes in paths causing problems
 # on linux
 #src-tarball = true
+#
+
+# Whether to allow failures when building tools
+#missing-tools = false
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
index ba2be29e45932..c3fbc8eeca6ba 100644
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
@@ -272,6 +272,7 @@ struct Dist {
     gpg_password_file: Option<String>,
     upload_addr: Option<String>,
     src_tarball: Option<bool>,
+    missing_tools: Option<bool>,
 }
 
 #[derive(Deserialize)]
@@ -615,6 +616,7 @@ impl Config {
             config.dist_gpg_password_file = t.gpg_password_file.clone().map(PathBuf::from);
             config.dist_upload_addr = t.upload_addr.clone();
             set(&mut config.rust_dist_src, t.src_tarball);
+            set(&mut config.missing_tools, t.missing_tools);
         }
 
         // Now that we've reached the end of our configuration, infer the
diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
index 3b8af5061cb3b..d95603190d869 100755
--- a/src/bootstrap/configure.py
+++ b/src/bootstrap/configure.py
@@ -69,7 +69,7 @@ def v(*args):
 o("emscripten", None, "compile the emscripten backend as well as LLVM")
 o("full-tools", None, "enable all tools")
 o("lldb", "rust.lldb", "build lldb")
-o("enable-missing-tools", "build.missing-tools", "allow failures when building tools")
+o("missing-tools", "dist.missing-tools", "allow failures when building tools")
 
 # Optimization and debugging options. These may be overridden by the release
 # channel, etc.
diff --git a/src/ci/run.sh b/src/ci/run.sh
index 281f4f92a7fab..a9e506645f189 100755
--- a/src/ci/run.sh
+++ b/src/ci/run.sh
@@ -76,7 +76,7 @@ else
   fi
 fi
 
-if [ "$RUST_RELEASE_CHANNEL" = "nightly" ] or [ "$DIST_REQUIRE_ALL_TOOLS" = "" ]; then
+if [ "$RUST_RELEASE_CHANNEL" = "nightly" ] || [ "$DIST_REQUIRE_ALL_TOOLS" = "" ]; then
     RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-missing-tools"
 fi