Skip to content

Commit ac09e2f

Browse files
committed
Auto merge of #1417 - RalfJung:libstd-rebuilds, r=RalfJung
fix libstd rebuilds due to RUSTFLAGS changes Until recently we were always overwriting `RUSTFLAGS`, but we stopped doing that when moving to `MIRI_BE_RUSTC`. That introduced the regression in #1410. This fixes it. Fixes #1410
2 parents 04eb4a9 + d90a087 commit ac09e2f

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

src/bin/cargo-miri.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,7 @@ path = "lib.rs"
335335
command.current_dir(&dir);
336336
command.env("XARGO_HOME", &dir);
337337
command.env("XARGO_RUST_SRC", &rust_src);
338+
command.env_remove("RUSTFLAGS"); // Make sure external `RUSTFLAGS` do not influence the build.
338339
// Use Miri as rustc to build a libstd compatible with us (and use the right flags).
339340
// However, when we are running in bootstrap, we cannot just overwrite `RUSTC`,
340341
// because we still need bootstrap to distinguish between host and target crates.

0 commit comments

Comments
 (0)