mirror of
https://github.com/rust-lang/cargo.git
synced 2025-09-28 11:20:36 +00:00
Auto merge of #13072 - belovdv:jobserver-remove-env-var, r=weihanglo
remove jobserver env var in some tests This PR makes cargo compatible with [rust-lang/rust#113730](https://github.com/rust-lang/rust/pull/113730). Linked [comment](https://github.com/rust-lang/rust/pull/113730#issuecomment-1821892786). Problem to be fixed: shim for cargo fix spawns rustc with make environment variable inherited, which points to closed jobserver. r? `@weihanglo`
This commit is contained in:
commit
d5d9c35e5f
@ -110,6 +110,7 @@ fn rustc_shim_for_cargo_fix() -> Project {
|
||||
}
|
||||
let status = Command::new("rustc")
|
||||
.args(env::args().skip(1))
|
||||
.env_remove("CARGO_MAKEFLAGS")
|
||||
.status()
|
||||
.expect("failed to run rustc");
|
||||
process::exit(status.code().unwrap_or(2));
|
||||
|
Loading…
x
Reference in New Issue
Block a user