disable caching for cargo commands

2 files changed, 6 insertions, 3 deletions

diff --git a/src/bootstrap/src/core/builder/cargo.rs b/src/bootstrap/src/core/builder/cargo.rs
index a878291a33c..deb7106f185 100644
--- a/src/bootstrap/src/core/builder/cargo.rs
+++ b/src/bootstrap/src/core/builder/cargo.rs
@@ -131,7 +131,10 @@ impl Cargo {
     }
 
     pub fn into_cmd(self) -> BootstrapCommand {
-        self.into()
+        let mut cmd: BootstrapCommand = self.into();
+        // Disable caching for commands originating from Cargo-related operations.
+        cmd.do_not_cache();
+        cmd
     }
 
     /// Same as [`Cargo::new`] except this one doesn't configure the linker with
diff --git a/src/bootstrap/src/utils/exec.rs b/src/bootstrap/src/utils/exec.rs
index 4c38f3a7cc8..d092765ef76 100644
--- a/src/bootstrap/src/utils/exec.rs
+++ b/src/bootstrap/src/utils/exec.rs
@@ -544,7 +544,7 @@ impl ExecutionContext {
         let created_at = command.get_created_location();
         let executed_at = std::panic::Location::caller();
 
-        if self.dry_run() && !command.run_always {
+        if self.dry_run() && !command.run_in_dry_run {
             return DeferredCommand {
                 state: CommandState::Deferred {
                     process: None,
@@ -635,7 +635,7 @@ impl<'a> DeferredCommand<'a> {
                 let output =
                     Self::finish_process(process, command, stdout, stderr, executed_at, exec_ctx);
 
-                if (!exec_ctx.dry_run() || command.run_always)
+                if (!exec_ctx.dry_run() || command.run_in_dry_run)
                     && let (Some(cache_key), Some(_)) = (&cache_key, output.status())
                 {
                     exec_ctx.command_cache.insert(cache_key.clone(), output.clone());