Skip to content

Commit b05d9ee

Browse files
author
Matthew Healy
committed
Parse llvm_skip_rebuild into Config
1 parent 3c11e97 commit b05d9ee

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

src/bootstrap/config.rs

+6
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ pub struct Config {
6666
pub backtrace_on_ice: bool,
6767

6868
// llvm codegen options
69+
pub llvm_skip_rebuild: bool,
6970
pub llvm_assertions: bool,
7071
pub llvm_optimize: bool,
7172
pub llvm_thin_lto: bool,
@@ -242,6 +243,7 @@ struct Install {
242243
#[derive(Deserialize, Default)]
243244
#[serde(deny_unknown_fields, rename_all = "kebab-case")]
244245
struct Llvm {
246+
skip_rebuild: Option<bool>,
245247
optimize: Option<bool>,
246248
thin_lto: Option<bool>,
247249
release_debuginfo: Option<bool>,
@@ -487,6 +489,7 @@ impl Config {
487489

488490
// Store off these values as options because if they're not provided
489491
// we'll infer default values for them later
492+
let mut llvm_skip_rebuild = None;
490493
let mut llvm_assertions = None;
491494
let mut debug = None;
492495
let mut debug_assertions = None;
@@ -510,6 +513,7 @@ impl Config {
510513
}
511514
set(&mut config.ninja, llvm.ninja);
512515
llvm_assertions = llvm.assertions;
516+
llvm_skip_rebuild = llvm.skip_rebuild;
513517
set(&mut config.llvm_optimize, llvm.optimize);
514518
set(&mut config.llvm_thin_lto, llvm.thin_lto);
515519
set(&mut config.llvm_release_debuginfo, llvm.release_debuginfo);
@@ -617,6 +621,8 @@ impl Config {
617621
set(&mut config.initial_rustc, build.rustc.map(PathBuf::from));
618622
set(&mut config.initial_cargo, build.cargo.map(PathBuf::from));
619623

624+
config.llvm_skip_rebuild = llvm_skip_rebuild.unwrap_or(false);
625+
620626
let default = false;
621627
config.llvm_assertions = llvm_assertions.unwrap_or(default);
622628

0 commit comments

Comments
 (0)