Skip to content

Commit 4a30cd1

Browse files
authored
Rollup merge of rust-lang#129942 - onur-ozkan:building-rustc-tools, r=Kobzol
copy rustc rustlib artifacts from ci-rustc We recently (since rust-lang#129311) had an issue because some rustlib files were missing (like: "error[E0463]: can't find crate for rustc_ast") when building tools that rely on rustc. This patch fixes that by copying those files as required. r? Kobzol Blocker for rust-lang#122709
2 parents 0d79ab9 + b5d07fd commit 4a30cd1

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/bootstrap/src/core/build_steps/compile.rs

+6-1
Original file line numberDiff line numberDiff line change
@@ -931,7 +931,12 @@ impl Step for Rustc {
931931
// NOTE: the ABI of the beta compiler is different from the ABI of the downloaded compiler,
932932
// so its artifacts can't be reused.
933933
if builder.download_rustc() && compiler.stage != 0 {
934-
builder.ensure(Sysroot { compiler, force_recompile: false });
934+
let sysroot = builder.ensure(Sysroot { compiler, force_recompile: false });
935+
cp_rustc_component_to_ci_sysroot(
936+
builder,
937+
&sysroot,
938+
builder.config.ci_rustc_dev_contents(),
939+
);
935940
return compiler.stage;
936941
}
937942

0 commit comments

Comments
 (0)