Skip to content

Commit 17d27c9

Browse files
committed
let tool::Miri implementation to handle compilers
Signed-off-by: onur-ozkan <work@onurozkan.dev>
1 parent 55298ea commit 17d27c9

File tree

1 file changed

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

1 file changed

+4
-2
lines changed

src/bootstrap/src/core/build_steps/run.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,10 @@ impl Step for Miri {
133133
}
134134

135135
// This compiler runs on the host, we'll just use it for the target.
136-
let target_compiler = builder.compiler(stage, host);
137-
let host_compiler = tool::get_tool_rustc_compiler(builder, target_compiler);
136+
let target_compiler = builder.compiler(stage, target);
137+
let miri_build = builder.ensure(tool::Miri { compiler: target_compiler, target });
138+
// Rustc tools are off by one stage, so use the build compiler to run miri.
139+
let host_compiler = miri_build.build_compiler;
138140

139141
// Get a target sysroot for Miri.
140142
let miri_sysroot = test::Miri::build_miri_sysroot(builder, target_compiler, target);

0 commit comments

Comments
 (0)