Skip to content

Commit cabbd1e

Browse files
onur-ozkancuviper
authored andcommitted
fix the incorrect target on stage1 ui-fulldeps tests
Signed-off-by: onur-ozkan <work@onurozkan.dev> (cherry picked from commit b888e2f)
1 parent 57d0a18 commit cabbd1e

File tree

1 file changed

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

1 file changed

+7
-2
lines changed

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

+7-2
Original file line numberDiff line numberDiff line change
@@ -1597,8 +1597,13 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
15971597
// NOTE: Only stage 1 is special cased because we need the rustc_private artifacts to match the
15981598
// running compiler in stage 2 when plugins run.
15991599
let stage_id = if suite == "ui-fulldeps" && compiler.stage == 1 {
1600-
compiler = builder.compiler(compiler.stage - 1, target);
1601-
format!("stage{}-{}", compiler.stage + 1, target)
1600+
// At stage 0 (stage - 1) we are using the beta compiler. Using `self.target` can lead finding
1601+
// an incorrect compiler path on cross-targets, as the stage 0 beta compiler is always equal
1602+
// to `build.build` in the configuration.
1603+
let build = builder.build.build;
1604+
1605+
compiler = builder.compiler(compiler.stage - 1, build);
1606+
format!("stage{}-{}", compiler.stage + 1, build)
16021607
} else {
16031608
format!("stage{}-{}", compiler.stage, target)
16041609
};

0 commit comments

Comments
 (0)