about summary refs log tree commit diff
path: root/src/bootstrap/builder
diff options
context:
space:
mode:
authorMark Rousskov <mark.simulacrum@gmail.com>2020-09-01 09:17:26 -0400
committerMark Rousskov <mark.simulacrum@gmail.com>2020-09-01 10:13:56 -0400
commitd77c351c893b29167df0ccbfca3fe77334e7f89b (patch)
tree8404f4f716c5f5ffc9a1e561b631ed75f0373325 /src/bootstrap/builder
parente88e908e66cd1e6e30d789b37bcd774951d01856 (diff)
downloadrust-d77c351c893b29167df0ccbfca3fe77334e7f89b.tar.gz
rust-d77c351c893b29167df0ccbfca3fe77334e7f89b.zip
Move ninja requirements to a dynamic check, when actually building
It isn't practical to determine whether we'll build LLVM very early in the
pipeline, so move the ninja checking to a dynamic check.
Diffstat (limited to 'src/bootstrap/builder')
-rw-r--r--src/bootstrap/builder/tests.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/builder/tests.rs b/src/bootstrap/builder/tests.rs
index c395e1da6dd..aeb0d713ef0 100644
--- a/src/bootstrap/builder/tests.rs
+++ b/src/bootstrap/builder/tests.rs
@@ -8,7 +8,7 @@ fn configure(host: &[&str], target: &[&str]) -> Config {
     config.save_toolstates = None;
     config.skip_only_host_steps = false;
     config.dry_run = true;
-    config.ninja = false;
+    config.ninja_in_file = false;
     // try to avoid spurious failures in dist where we create/delete each others file
     let dir = config
         .out