From a627b4f2bfb3012bd69650ee7defc9ef2ef2ec1e Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Sun, 19 Sep 2021 14:27:49 +0100 Subject: [PATCH 1/2] [bootstrap] Improve the error message when `ninja` is not found to link to installation instructions. Signed-off-by: Daira Hopwood --- src/bootstrap/lib.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index a4735d54be0..9302217297b 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -1494,8 +1494,12 @@ impl Build { { eprintln!( " -Couldn't find required command: ninja -You should install ninja, or set `ninja=false` in config.toml in the `[llvm]` section. +Couldn't find required command: ninja (or ninja-build) + +You should install ninja as described at +, +or set `download-ci-llvm = true` in the `[llvm]` section of `config.toml` +to download LLVM rather than building it. " ); std::process::exit(1); From 23d643712807bdbc49e82c5b3170c1b33d3be8ee Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Sun, 19 Sep 2021 19:50:08 +0100 Subject: [PATCH 2/2] Restore the suggestion to set `ninja = false`. --- src/bootstrap/lib.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index 9302217297b..2d4e1527897 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -1498,7 +1498,8 @@ Couldn't find required command: ninja (or ninja-build) You should install ninja as described at , -or set `download-ci-llvm = true` in the `[llvm]` section of `config.toml` +or set `ninja = false` in the `[llvm]` section of `config.toml`. +Alternatively, set `download-ci-llvm = true` in that `[llvm]` section to download LLVM rather than building it. " );