development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-10-12 18:52:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: cargo fix: always inherit the jobserver

Browse source
This commit is contained in:
Eric Huss 2023-12-30 15:10:04 -08:00
parent 2ed2dbd8ce
commit 448c437ef0
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/cargo/ops/fix.rs
View file

@ -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()?);
}