Skip to content

Commit af81ab7

Browse files
committed
remove miri jobserver workaround
1 parent 0fd5712 commit af81ab7

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

Diff for: src/tools/miri/cargo-miri/src/phases.rs

-7
Original file line numberDiff line numberDiff line change
@@ -519,13 +519,6 @@ pub fn phase_runner(mut binary_args: impl Iterator<Item = String>, phase: Runner
519519
// Set missing env vars. We prefer build-time env vars over run-time ones; see
520520
// <https://github.com/rust-lang/miri/issues/1661> for the kind of issue that fixes.
521521
for (name, val) in info.env {
522-
// `CARGO_MAKEFLAGS` contains information about how to reach the jobserver, but by the time
523-
// the program is being run, that jobserver no longer exists (cargo only runs the jobserver
524-
// for the build portion of `cargo run`/`cargo test`). Hence we shouldn't forward this.
525-
// Also see <https://github.com/rust-lang/rust/pull/113730>.
526-
if name == "CARGO_MAKEFLAGS" {
527-
continue;
528-
}
529522
if let Some(old_val) = env::var_os(&name) {
530523
if old_val == val {
531524
// This one did not actually change, no need to re-set it.

0 commit comments

Comments
 (0)