add cach cmd to execution context

Author: Shourya742

src/bootstrap/src/core/config/config.rs

@@ -442,8 +442,6 @@ impl Config {
         exec_ctx.set_verbose(flags_verbose);
         exec_ctx.set_fail_fast(flags_cmd.fail_fast());
 
-        config.exec_ctx = exec_ctx;
-
         // Set flags.
         config.paths = std::mem::take(&mut flags_paths);
 
@@ -484,8 +482,52 @@ impl Config {
         config.is_running_on_ci = flags_ci.unwrap_or(CiEnv::is_ci());
         config.skip_std_check_if_no_download_rustc = flags_skip_std_check_if_no_download_rustc;
 
-        // Infer the rest of the configuration.
+        // Locate the configuration file using the following priority (first match wins):
+        // 1. `--config <path>` (explicit flag)
+        // 2. `RUST_BOOTSTRAP_CONFIG` environment variable
+        // 3. `./bootstrap.toml` (local file)
+        // 4. `<root>/bootstrap.toml`
+        // 5. `./config.toml` (fallback for backward compatibility)
+        // 6. `<root>/config.toml`
+        let toml_path = flags_config
+            .clone()
+            .or_else(|| env::var_os("RUST_BOOTSTRAP_CONFIG").map(PathBuf::from));
+        let using_default_path = toml_path.is_none();
+        let mut toml_path = toml_path.unwrap_or_else(|| PathBuf::from("bootstrap.toml"));
+
+        if using_default_path && !toml_path.exists() {
+            toml_path = config.src.join(PathBuf::from("bootstrap.toml"));
+            if !toml_path.exists() {
+                toml_path = PathBuf::from("config.toml");
+                if !toml_path.exists() {
+                    toml_path = config.src.join(PathBuf::from("config.toml"));
+                }
+            }
+        }
+
+        // Give a hard error if `--config` or `RUST_BOOTSTRAP_CONFIG` are set to a missing path,
+        // but not if `bootstrap.toml` hasn't been created.
+        let mut toml = if !using_default_path || toml_path.exists() {
+            config.config = Some(if cfg!(not(test)) {
+                toml_path = toml_path.canonicalize().unwrap();
+                toml_path.clone()
+            } else {
+                toml_path.clone()
+            });
+            get_toml(&toml_path).unwrap_or_else(|e| {
+                eprintln!("ERROR: Failed to parse '{}': {e}", toml_path.display());
+                exit!(2);
+            })
+        } else {
+            config.config = None;
+            TomlConfig::default()
+        };
+
+        exec_ctx.set_cache_cmd(toml.cache_cmd.unwrap_or_default());
 
+        config.exec_ctx = exec_ctx;
+
+        // Infer the rest of the configuration.
         if let Some(src) = flags_src {
             config.src = src
         } else {
@@ -545,47 +587,6 @@ impl Config {
 
         config.stage0_metadata = build_helper::stage0_parser::parse_stage0_file();
 
-        // Locate the configuration file using the following priority (first match wins):
-        // 1. `--config <path>` (explicit flag)
-        // 2. `RUST_BOOTSTRAP_CONFIG` environment variable
-        // 3. `./bootstrap.toml` (local file)
-        // 4. `<root>/bootstrap.toml`
-        // 5. `./config.toml` (fallback for backward compatibility)
-        // 6. `<root>/config.toml`
-        let toml_path = flags_config
-            .clone()
-            .or_else(|| env::var_os("RUST_BOOTSTRAP_CONFIG").map(PathBuf::from));
-        let using_default_path = toml_path.is_none();
-        let mut toml_path = toml_path.unwrap_or_else(|| PathBuf::from("bootstrap.toml"));
-
-        if using_default_path && !toml_path.exists() {
-            toml_path = config.src.join(PathBuf::from("bootstrap.toml"));
-            if !toml_path.exists() {
-                toml_path = PathBuf::from("config.toml");
-                if !toml_path.exists() {
-                    toml_path = config.src.join(PathBuf::from("config.toml"));
-                }
-            }
-        }
-
-        // Give a hard error if `--config` or `RUST_BOOTSTRAP_CONFIG` are set to a missing path,
-        // but not if `bootstrap.toml` hasn't been created.
-        let mut toml = if !using_default_path || toml_path.exists() {
-            config.config = Some(if cfg!(not(test)) {
-                toml_path = toml_path.canonicalize().unwrap();
-                toml_path.clone()
-            } else {
-                toml_path.clone()
-            });
-            get_toml(&toml_path).unwrap_or_else(|e| {
-                eprintln!("ERROR: Failed to parse '{}': {e}", toml_path.display());
-                exit!(2);
-            })
-        } else {
-            config.config = None;
-            TomlConfig::default()
-        };
-
         if cfg!(test) {
             // When configuring bootstrap for tests, make sure to set the rustc and Cargo to the
             // same ones used to call the tests (if custom ones are not defined in the toml). If we

src/bootstrap/src/utils/execution_context.rs

@@ -21,6 +21,7 @@ pub struct ExecutionContext {
     pub fail_fast: bool,
     delayed_failures: Arc<Mutex<Vec<String>>>,
     command_cache: Arc<CommandCache>,
+    cache_cmd: bool,
 }
 
 #[derive(Default)]
@@ -58,6 +59,14 @@ impl ExecutionContext {
         &self.dry_run
     }
 
+    pub fn cache_cmd(&self) -> bool {
+        self.cache_cmd
+    }
+
+    pub fn set_cache_cmd(&mut self, cache_cmd: bool) {
+        self.cache_cmd = cache_cmd;
+    }
+
     pub fn verbose(&self, f: impl Fn()) {
         if self.is_verbose() {
             f()