Skip to content

Commit b888e2f

Browse files
committed
fix the incorrect target on stage1 ui-fulldeps tests
Signed-off-by: onur-ozkan <[email protected]>
1 parent 26c71cb commit b888e2f

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

0 commit comments

Comments
 (0)