Skip to content

Commit 3324086

Browse files
committed
add cache command field to bootstrap toml
1 parent d5cd7e3 commit 3324086

File tree

1 file changed

+15
-1
lines changed
  • src/bootstrap/src/core/config/toml

1 file changed

+15
-1
lines changed

src/bootstrap/src/core/config/toml/mod.rs

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,27 @@ pub(crate) struct TomlConfig {
4949
pub(super) dist: Option<Dist>,
5050
pub(super) profile: Option<String>,
5151
pub(super) include: Option<Vec<PathBuf>>,
52+
pub(super) cache_cmd: Option<bool>,
5253
}
5354

5455
impl Merge for TomlConfig {
5556
fn merge(
5657
&mut self,
5758
parent_config_path: Option<PathBuf>,
5859
included_extensions: &mut HashSet<PathBuf>,
59-
TomlConfig { build, install, llvm, gcc, rust, dist, target, profile, change_id, include }: Self,
60+
TomlConfig {
61+
build,
62+
install,
63+
llvm,
64+
gcc,
65+
rust,
66+
dist,
67+
target,
68+
profile,
69+
change_id,
70+
include,
71+
cache_cmd,
72+
}: Self,
6073
replace: ReplaceOpt,
6174
) {
6275
fn do_merge<T: Merge>(x: &mut Option<T>, y: Option<T>, replace: ReplaceOpt) {
@@ -71,6 +84,7 @@ impl Merge for TomlConfig {
7184

7285
self.change_id.inner.merge(None, &mut Default::default(), change_id.inner, replace);
7386
self.profile.merge(None, &mut Default::default(), profile, replace);
87+
self.cache_cmd.merge(None, &mut Default::default(), cache_cmd, replace);
7488

7589
do_merge(&mut self.build, build, replace);
7690
do_merge(&mut self.install, install, replace);

0 commit comments

Comments
 (0)