diff options
Diffstat (limited to 'meta/recipes-devtools/rust/files/target-build-value.patch')
-rw-r--r-- | meta/recipes-devtools/rust/files/target-build-value.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/meta/recipes-devtools/rust/files/target-build-value.patch b/meta/recipes-devtools/rust/files/target-build-value.patch deleted file mode 100644 index cf59afba5a..0000000000 --- a/meta/recipes-devtools/rust/files/target-build-value.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | Add correct build value for cross-compiled targets on stage1 when | ||
2 | bootstapping rustc. | ||
3 | |||
4 | Upstream-Status: Backport [https://github.com/rust-lang/rust/pull/119619/commits/b888e2f82b9dbe81875f50d13adbc0271a9401ff] | ||
5 | |||
6 | Signed-off-by: onur-ozkan <work@onurozkan.dev> | ||
7 | Signed-off-by: Yash Shinde <Yash.Shinde@windriver.com> | ||
8 | --- | ||
9 | diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs | ||
10 | --- a/src/bootstrap/src/core/build_steps/test.rs | ||
11 | +++ b/src/bootstrap/src/core/build_steps/test.rs | ||
12 | @@ -1489,8 +1489,12 @@ | ||
13 | // NOTE: Only stage 1 is special cased because we need the rustc_private artifacts to match the | ||
14 | // running compiler in stage 2 when plugins run. | ||
15 | let stage_id = if suite == "ui-fulldeps" && compiler.stage == 1 { | ||
16 | - compiler = builder.compiler(compiler.stage - 1, target); | ||
17 | - format!("stage{}-{}", compiler.stage + 1, target) | ||
18 | + // At stage 0 (stage - 1) we are using the beta compiler. Using `self.target` can lead finding | ||
19 | + // an incorrect compiler path on cross-targets, as the stage 0 beta compiler is always equal | ||
20 | + // to `build.build` in the configuration. | ||
21 | + let build = builder.build.build; | ||
22 | + compiler = builder.compiler(compiler.stage - 1, build); | ||
23 | + format!("stage{}-{}", compiler.stage + 1, build) | ||
24 | } else { | ||
25 | format!("stage{}-{}", compiler.stage, target) | ||
26 | }; | ||