Skip to content

Commit bf067c7

Browse files
committed
./x miri: fix sysroot build
1 parent 3a9bc76 commit bf067c7

File tree

1 file changed

+4
-0
lines changed
  • src/bootstrap/src/core/build_steps

1 file changed

+4
-0
lines changed

src/bootstrap/src/core/build_steps/test.rs

+4
Original file line numberDiff line numberDiff line change
@@ -2756,6 +2756,10 @@ impl Step for Crate {
27562756
// `lib.rs` file, and a `lib.miri.rs` file exists in the same folder, we build that
27572757
// instead. But crucially we only do that for the library, not the test builds.
27582758
cargo.env("MIRI_REPLACE_LIBRS_IF_NOT_TEST", "1");
2759+
// std needs to be built with `-Zforce-unstable-if-unmarked`. For some reason the builder
2760+
// does not set this directly, but relies on the rustc wrapper to set it, and we are not using
2761+
// the wrapper -- hence we have to set it ourselves.
2762+
cargo.rustflag("-Zforce-unstable-if-unmarked");
27592763
cargo
27602764
} else {
27612765
// Also prepare a sysroot for the target.

0 commit comments

Comments
 (0)