Skip to content

Commit 5dc77ba

Browse files
committed
Do not ever cross-check bootstrap tools
1 parent baa55ae commit 5dc77ba

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

src/bootstrap/src/core/build_steps/check.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,13 @@ macro_rules! tool_check_step {
502502
fn make_run(run: RunConfig<'_>) {
503503
let target = run.target;
504504
let build_compiler = prepare_compiler_for_check(run.builder, target, $mode);
505+
506+
// It doesn't make sense to cross-check bootstrap tools
507+
if $mode == Mode::ToolBootstrap && target != run.builder.host_target {
508+
println!("WARNING: not checking bootstrap tool {} for target {target} as it is a bootstrap (host-only) tool", stringify!($path));
509+
return;
510+
};
511+
505512
run.builder.ensure($name { target, build_compiler });
506513
}
507514

src/bootstrap/src/core/builder/tests.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1313,11 +1313,9 @@ mod snapshot {
13131313
[check] rustc 1 <host> -> Clippy 2 <target1>
13141314
[check] rustc 1 <host> -> Miri 2 <target1>
13151315
[check] rustc 1 <host> -> CargoMiri 2 <target1>
1316-
[check] rustc 0 <host> -> MiroptTestTools 1 <target1>
13171316
[check] rustc 1 <host> -> Rustfmt 2 <target1>
13181317
[check] rustc 1 <host> -> rust-analyzer 2 <target1>
13191318
[check] rustc 1 <host> -> TestFloatParse 2 <target1>
1320-
[check] rustc 0 <host> -> FeaturesStatusDump 1 <target1>
13211319
[check] rustc 1 <host> -> std 1 <target1>
13221320
");
13231321
}

0 commit comments

Comments
 (0)