command line args trump config.toml settings

This commit is contained in:
Oliver Schneider 2018-06-03 08:44:56 +02:00
parent 7a52f1c7cf
commit 3b02376c8f
1 changed files with 4 additions and 1 deletions

View File

@ -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);