diff options
| author | bors <bors@rust-lang.org> | 2024-04-05 09:09:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-05 09:09:35 +0000 |
| commit | d009f60b55fe4527e7ddf122bc4520f351d7b9d4 (patch) | |
| tree | a02b8ae891c28c176f82b207729930a8a81dd989 | |
| parent | c0ddaef075748674140263840a185082f44458e9 (diff) | |
| parent | af81ab762888eb04d01e9ad5269df5202d6a38b8 (diff) | |
| download | rust-d009f60b55fe4527e7ddf122bc4520f351d7b9d4.tar.gz rust-d009f60b55fe4527e7ddf122bc4520f351d7b9d4.zip | |
Auto merge of #123469 - belovdv:remove-miri-jobserver-fixme, r=petrochenkov
remove miri jobserver workaround This PR removes workaround, added in #113730, since jobserver is kept after [rust-lang/cargo#12776](https://github.com/rust-lang/cargo/pull/12776)
| -rw-r--r-- | src/tools/miri/cargo-miri/src/phases.rs | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/tools/miri/cargo-miri/src/phases.rs b/src/tools/miri/cargo-miri/src/phases.rs index 694720ab21f..8e08eb898cd 100644 --- a/src/tools/miri/cargo-miri/src/phases.rs +++ b/src/tools/miri/cargo-miri/src/phases.rs @@ -519,13 +519,6 @@ pub fn phase_runner(mut binary_args: impl Iterator<Item = String>, phase: Runner // Set missing env vars. We prefer build-time env vars over run-time ones; see // <https://github.com/rust-lang/miri/issues/1661> for the kind of issue that fixes. for (name, val) in info.env { - // `CARGO_MAKEFLAGS` contains information about how to reach the jobserver, but by the time - // the program is being run, that jobserver no longer exists (cargo only runs the jobserver - // for the build portion of `cargo run`/`cargo test`). Hence we shouldn't forward this. - // Also see <https://github.com/rust-lang/rust/pull/113730>. - if name == "CARGO_MAKEFLAGS" { - continue; - } if let Some(old_val) = env::var_os(&name) { if old_val == val { // This one did not actually change, no need to re-set it. |