From 3b02376c8f9ea0d41c164931f60c52bea68df225 Mon Sep 17 00:00:00 2001 From: Oliver Schneider Date: Sun, 3 Jun 2018 08:44:56 +0200 Subject: [PATCH] command line args trump config.toml settings --- src/bootstrap/config.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs index fbe9976b41397..47feb8a8ab66d 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs @@ -530,7 +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); - set(&mut config.incremental, rust.incremental); + // 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);