bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Prefer llvm-skip-rebuild flag value over config.toml

Browse source
This commit is contained in:
Matthew Healy 2020-01-09 23:13:57 +01:00
parent 0bbbd5d418
commit 7e50b599bf
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/bootstrap/config.rs
View file

@ -493,9 +493,13 @@ impl Config {
config.mandir = install.mandir.clone().map(PathBuf::from); config.mandir = install.mandir.clone().map(PathBuf::from);
} }
// We want the llvm-skip-rebuild flag to take precedence over the
// skip-rebuild config.toml option so we store it separately
// so that we can infer the right value
let mut llvm_skip_rebuild = flags.llvm_skip_rebuild;
// Store off these values as options because if they're not provided // Store off these values as options because if they're not provided
// we'll infer default values for them later // we'll infer default values for them later
let mut llvm_skip_rebuild = None;
let mut llvm_assertions = None; let mut llvm_assertions = None;
let mut debug = None; let mut debug = None;
let mut debug_assertions = None; let mut debug_assertions = None;
@ -517,7 +521,7 @@ impl Config {
} }
set(&mut config.ninja, llvm.ninja); set(&mut config.ninja, llvm.ninja);
llvm_assertions = llvm.assertions; llvm_assertions = llvm.assertions;
llvm_skip_rebuild = llvm.skip_rebuild; llvm_skip_rebuild = llvm_skip_rebuild.or(llvm.skip_rebuild);
set(&mut config.llvm_optimize, llvm.optimize); set(&mut config.llvm_optimize, llvm.optimize);
set(&mut config.llvm_thin_lto, llvm.thin_lto); set(&mut config.llvm_thin_lto, llvm.thin_lto);
set(&mut config.llvm_release_debuginfo, llvm.release_debuginfo); set(&mut config.llvm_release_debuginfo, llvm.release_debuginfo);