bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #129311 - onur-ozkan:multiple-candidates-fix, r=Kobzol

Browse source 
don't copy `.rustc-dev-contents` from CI rustc

Since https://github.com/rust-lang/rust/pull/127188, copying files from `.rustc-dev-contents` regressed https://github.com/rust-lang/rust/issues/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.

Blocker for #122709
This commit is contained in:
Matthias Krüger 2024-09-03 06:05:39 +02:00 • committed by GitHub
commit 44187d667c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/bootstrap/src/core/build_steps/compile.rs
View file

@ -1692,16 +1692,8 @@ impl Step for Sysroot {
build_helper::exit!(1); build_helper::exit!(1);
} }
// Unlike rust-src component, we have to handle rustc-src a bit differently. // rustc-src component is already part of CI rustc's sysroot
// When using CI rustc, we copy rustc-src component from its sysroot, if !builder.download_rustc() {
// otherwise we handle it in a similar way what we do for rust-src above.
if builder.download_rustc() {
cp_rustc_component_to_ci_sysroot(
builder,
&sysroot,
builder.config.ci_rustc_dev_contents(),
);
} else {
let sysroot_lib_rustlib_rustcsrc = sysroot.join("lib/rustlib/rustc-src"); let sysroot_lib_rustlib_rustcsrc = sysroot.join("lib/rustlib/rustc-src");
t!(fs::create_dir_all(&sysroot_lib_rustlib_rustcsrc)); t!(fs::create_dir_all(&sysroot_lib_rustlib_rustcsrc));
let sysroot_lib_rustlib_rustcsrc_rust = sysroot_lib_rustlib_rustcsrc.join("rust"); let sysroot_lib_rustlib_rustcsrc_rust = sysroot_lib_rustlib_rustcsrc.join("rust");