about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorMark Simulacrum <mark.simulacrum@gmail.com>2018-06-03 18:18:04 -0600
committerGitHub <noreply@github.com>2018-06-03 18:18:04 -0600
commit79dd148458ba2e4756fcd86c8e48afbb29ece15d (patch)
tree612594158d3985592e6513ca98bbc4e6acd777e8 /src
parentb35c60e95e99a02fdc3ce57121aad558164b0f76 (diff)
parent3b02376c8f9ea0d41c164931f60c52bea68df225 (diff)
downloadrust-79dd148458ba2e4756fcd86c8e48afbb29ece15d.tar.gz
rust-79dd148458ba2e4756fcd86c8e48afbb29ece15d.zip
Rollup merge of #51317 - oli-obk:incremental_all_the_way, r=Mark-Simulacrum
Allow enabling incremental via config.toml

r? @QuietMisdreavus
Diffstat (limited to 'src')
-rw-r--r--src/bootstrap/config.rs5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
index 9840682d137..47feb8a8ab6 100644
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
@@ -303,6 +303,7 @@ struct Rust {
     dist_src: Option<bool>,
     quiet_tests: Option<bool>,
     test_miri: Option<bool>,
+    incremental: Option<bool>,
     save_toolstates: Option<String>,
     codegen_backends: Option<Vec<String>>,
     codegen_backends_dir: Option<String>,
@@ -529,6 +530,10 @@ impl Config {
             set(&mut config.rust_dist_src, rust.dist_src);
             set(&mut config.quiet_tests, rust.quiet_tests);
             set(&mut config.test_miri, rust.test_miri);
+            // in the case "false" is set explicitly, do not overwrite the command line args
+            if let Some(true) = rust.incremental {
+                config.incremental = true;
+            }
             set(&mut config.wasm_syscall, rust.wasm_syscall);
             set(&mut config.lld_enabled, rust.lld);
             config.rustc_parallel_queries = rust.experimental_parallel_queries.unwrap_or(false);