From fa6d54f5c4373c19f0f63b64df483a5537b42c30 Mon Sep 17 00:00:00 2001
From: onur-ozkan <work@onurozkan.dev>
Date: Tue, 20 Aug 2024 15:59:35 +0300
Subject: [PATCH] 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.
Signed-off-by: onur-ozkan <work@onurozkan.dev>
---
src/bootstrap/src/core/build_steps/compile.rs | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
index 4353cfadd8d..e669f106438 100644
--- a/src/bootstrap/src/core/build_steps/compile.rs
+++ b/src/bootstrap/src/core/build_steps/compile.rs
@@ -1672,16 +1672,8 @@ impl Step for Sysroot {
build_helper::exit!(1);
}
- // Unlike rust-src component, we have to handle rustc-src a bit differently.
- // When using CI rustc, we copy rustc-src component from its sysroot,
- // 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 {
+ // rustc-src component is already part of CI rustc's sysroot
+ if !builder.download_rustc() {
let sysroot_lib_rustlib_rustcsrc = sysroot.join("lib/rustlib/rustc-src");
t!(fs::create_dir_all(&sysroot_lib_rustlib_rustcsrc));
let sysroot_lib_rustlib_rustcsrc_rust = sysroot_lib_rustlib_rustcsrc.join("rust");