Skip to content

Commit fa6d54f

Browse files
committed
don't copy .rustc-dev-contents from CI rustc
Since rust-lang#127188, copying files from `.rustc-dev-contents` regressed rust-lang#108767 again. Since `rustc-src` is already included in the CI rustc sysroot, we don't need to copy these files to have `rustc-src` component. Signed-off-by: onur-ozkan <work@onurozkan.dev>
1 parent f04f6ca commit fa6d54f

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

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

+2-10
Original file line numberDiff line numberDiff line change
@@ -1672,16 +1672,8 @@ impl Step for Sysroot {
16721672
build_helper::exit!(1);
16731673
}
16741674

1675-
// Unlike rust-src component, we have to handle rustc-src a bit differently.
1676-
// When using CI rustc, we copy rustc-src component from its sysroot,
1677-
// otherwise we handle it in a similar way what we do for rust-src above.
1678-
if builder.download_rustc() {
1679-
cp_rustc_component_to_ci_sysroot(
1680-
builder,
1681-
&sysroot,
1682-
builder.config.ci_rustc_dev_contents(),
1683-
);
1684-
} else {
1675+
// rustc-src component is already part of CI rustc's sysroot
1676+
if !builder.download_rustc() {
16851677
let sysroot_lib_rustlib_rustcsrc = sysroot.join("lib/rustlib/rustc-src");
16861678
t!(fs::create_dir_all(&sysroot_lib_rustlib_rustcsrc));
16871679
let sysroot_lib_rustlib_rustcsrc_rust = sysroot_lib_rustlib_rustcsrc.join("rust");

0 commit comments

Comments
 (0)