about summary refs log tree commit diff
diff options
context:
space:
mode:
authorYuki Okushi <jtitor@2k36.org>2021-06-05 06:13:47 +0900
committerGitHub <noreply@github.com>2021-06-05 06:13:47 +0900
commit062e789a73e729ae6a05f724b0b06c357aaa2ebd (patch)
tree1e0193d5455473fac3532621e1517f3ec5d89d2d
parentd5c9894109b11f788feadc62ef82bf75c6207f3d (diff)
parent3ed7f3f3745be54794fd7f54315a48fe6bb4014a (diff)
downloadrust-062e789a73e729ae6a05f724b0b06c357aaa2ebd.tar.gz
rust-062e789a73e729ae6a05f724b0b06c357aaa2ebd.zip
Rollup merge of #85988 - jyn514:ninja-error, r=joshtriplett
Note that `ninja = false` goes under `[llvm]`

Addresses https://github.com/rust-lang/rust/issues/84938#issuecomment-852448332 - `@kornelski` does this look good?

r? `@Mark-Simulacrum` cc `@joshtriplett`
-rw-r--r--src/bootstrap/lib.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index 2960dd3df6b..1ea29a829c2 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -1366,7 +1366,7 @@ impl Build {
                 eprintln!(
                     "
 Couldn't find required command: ninja
-You should install ninja, or set ninja=false in config.toml
+You should install ninja, or set `ninja=false` in config.toml in the `[llvm]` section.
 "
                 );
                 std::process::exit(1);