diff options
| author | Ralf Jung <post@ralfj.de> | 2024-01-22 08:59:12 +0100 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2024-01-22 08:59:12 +0100 |
| commit | 80874d3f21eb400e4d0de0a4d3fcdea5ad079aa9 (patch) | |
| tree | b376fcce9d509e87df55073d98cd001167673cbc | |
| parent | 70e720bc685e21bbae276445fedf7d89613ecb0d (diff) | |
| download | rust-80874d3f21eb400e4d0de0a4d3fcdea5ad079aa9.tar.gz rust-80874d3f21eb400e4d0de0a4d3fcdea5ad079aa9.zip | |
update comment about CARGO_MAKEFLAGS
| -rw-r--r-- | src/tools/miri/cargo-miri/src/phases.rs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/tools/miri/cargo-miri/src/phases.rs b/src/tools/miri/cargo-miri/src/phases.rs index a7412f90c85..79ce1f4ca32 100644 --- a/src/tools/miri/cargo-miri/src/phases.rs +++ b/src/tools/miri/cargo-miri/src/phases.rs @@ -501,11 +501,10 @@ 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. Hence we shouldn't forward this. - // FIXME: Miri builds the final crate without a jobserver. - // This may be fixed with github.com/rust-lang/cargo/issues/12597. + // `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; } |
