From 448c437ef0c1271118f3d50287fdcb61332de83a Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Sat, 30 Dec 2023 15:10:04 -0800
Subject: [PATCH] fix: `cargo fix`: always inherit the jobserver

---
 src/cargo/ops/fix.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/cargo/ops/fix.rs b/src/cargo/ops/fix.rs
index 6630914a4ff..694b67bbc81 100644
--- a/src/cargo/ops/fix.rs
+++ b/src/cargo/ops/fix.rs
@@ -379,6 +379,11 @@ pub fn fix_exec_rustc(config: &Config, lock_addr: &str) -> CargoResult<()> {
     rustc.retry_with_argfile(true);
     rustc.env_remove(FIX_ENV_INTERNAL);
     args.apply(&mut rustc);
+    // Removes `FD_CLOEXEC` set by `jobserver::Client` to ensure that the
+    // compiler can access the jobserver.
+    if let Some(client) = config.jobserver_from_env() {
+        rustc.inherit_jobserver(client);
+    }
 
     trace!("start rustfixing {:?}", args.file);
     let json_error_rustc = {
@@ -451,11 +456,6 @@ pub fn fix_exec_rustc(config: &Config, lock_addr: &str) -> CargoResult<()> {
         // things like colored output to work correctly.
         rustc.arg(arg);
     }
-    // Removes `FD_CLOEXEC` set by `jobserver::Client` to pass jobserver
-    // as environment variables specify.
-    if let Some(client) = config.jobserver_from_env() {
-        rustc.inherit_jobserver(client);
-    }
     debug!("calling rustc to display remaining diagnostics: {rustc}");
     exit_with(rustc.status()?);
 }