diff options
| author | Jakub Beránek <berykubik@gmail.com> | 2025-07-05 23:56:17 +0200 |
|---|---|---|
| committer | Jakub Beránek <berykubik@gmail.com> | 2025-07-06 17:25:19 +0200 |
| commit | 5dc77ba6586ded662d4c5447da87a70d8a77651a (patch) | |
| tree | 47d2c526495153473a84c18282e9b00c19baf63e | |
| parent | baa55aef3a563278a3454b864502d5fd763e57b3 (diff) | |
| download | rust-5dc77ba6586ded662d4c5447da87a70d8a77651a.tar.gz rust-5dc77ba6586ded662d4c5447da87a70d8a77651a.zip | |
Do not ever cross-check bootstrap tools
| -rw-r--r-- | src/bootstrap/src/core/build_steps/check.rs | 7 | ||||
| -rw-r--r-- | src/bootstrap/src/core/builder/tests.rs | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/bootstrap/src/core/build_steps/check.rs b/src/bootstrap/src/core/build_steps/check.rs index 3a88469735b..0497bae86a1 100644 --- a/src/bootstrap/src/core/build_steps/check.rs +++ b/src/bootstrap/src/core/build_steps/check.rs @@ -502,6 +502,13 @@ macro_rules! tool_check_step { fn make_run(run: RunConfig<'_>) { let target = run.target; let build_compiler = prepare_compiler_for_check(run.builder, target, $mode); + + // It doesn't make sense to cross-check bootstrap tools + if $mode == Mode::ToolBootstrap && target != run.builder.host_target { + println!("WARNING: not checking bootstrap tool {} for target {target} as it is a bootstrap (host-only) tool", stringify!($path)); + return; + }; + run.builder.ensure($name { target, build_compiler }); } diff --git a/src/bootstrap/src/core/builder/tests.rs b/src/bootstrap/src/core/builder/tests.rs index a6bd531fd14..1d5690a8197 100644 --- a/src/bootstrap/src/core/builder/tests.rs +++ b/src/bootstrap/src/core/builder/tests.rs @@ -1313,11 +1313,9 @@ mod snapshot { [check] rustc 1 <host> -> Clippy 2 <target1> [check] rustc 1 <host> -> Miri 2 <target1> [check] rustc 1 <host> -> CargoMiri 2 <target1> - [check] rustc 0 <host> -> MiroptTestTools 1 <target1> [check] rustc 1 <host> -> Rustfmt 2 <target1> [check] rustc 1 <host> -> rust-analyzer 2 <target1> [check] rustc 1 <host> -> TestFloatParse 2 <target1> - [check] rustc 0 <host> -> FeaturesStatusDump 1 <target1> [check] rustc 1 <host> -> std 1 <target1> "); } |