Rollup merge of #97087 - Nilstrieb:clarify-slice-iteration-order, r=dtolnay

[rust.git] / src / bootstrap / sanity.rs

diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs
index c96e6f9a3678f222937714e4561fa472aae0cbec..64c5dd7aea7202ef50a4ba49cc3738c6727c7f16 100644 (file)
--- a/src/bootstrap/sanity.rs
+++ b/src/bootstrap/sanity.rs
@@ -94,7 +94,18 @@ pub fn check(build: &mut Build) {
             .any(|build_llvm_ourselves| build_llvm_ourselves);
     let need_cmake = building_llvm || build.config.any_sanitizers_enabled();
     if need_cmake {
-        cmd_finder.must_have("cmake");
+        if cmd_finder.maybe_have("cmake").is_none() {
+            eprintln!(
+                "
+Couldn't find required command: cmake
+
+You should install cmake, or set `download-ci-llvm = true` in the
+`[llvm]` section section of `config.toml` to download LLVM rather
+than building it.
+"
+            );
+            std::process::exit(1);
+        }
     }
 
     build.config.python = build