From bb8c497566e2ec14af0faca0cbad70c1bd090dbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= <berykubik@gmail.com>
Date: Tue, 4 Jul 2023 22:53:45 +0200
Subject: [PATCH] Copy stage0 `rustc` binaries to `stage0-sysroot`
---
src/bootstrap/compile.rs | 43 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
index 14c3ef79a78f2..efe621bdb7d57 100644
--- a/src/bootstrap/compile.rs
+++ b/src/bootstrap/compile.rs
@@ -508,6 +508,49 @@ impl Step for StdLink {
};
add_to_sysroot(builder, &libdir, &hostdir, &libstd_stamp(builder, compiler, target));
+
+ // Special case for stage0, to make `rustup toolchain link` and `x dist --stage 0`
+ // work for stage0-sysroot. We only do this if the stage0 compiler comes from beta,
+ // and is not set to a custom path.
+ if compiler.stage == 0
+ && builder
+ .build
+ .config
+ .initial_rustc
+ .starts_with(builder.out.join(&compiler.host.triple).join("stage0/bin"))
+ {
+ // Copy bin files from stage0/bin to stage0-sysroot/bin
+ let sysroot = builder.out.join(&compiler.host.triple).join("stage0-sysroot");
+
+ let host = compiler.host.triple;
+ let stage0_bin_dir = builder.out.join(&host).join("stage0/bin");
+ let sysroot_bin_dir = sysroot.join("bin");
+ t!(fs::create_dir_all(&sysroot_bin_dir));
+ builder.cp_r(&stage0_bin_dir, &sysroot_bin_dir);
+
+ // Copy all *.so files from stage0/lib to stage0-sysroot/lib
+ let stage0_lib_dir = builder.out.join(&host).join("stage0/lib");
+ if let Ok(files) = fs::read_dir(&stage0_lib_dir) {
+ for file in files {
+ let file = t!(file);
+ let path = file.path();
+ if path.is_file() && is_dylib(&file.file_name().into_string().unwrap()) {
+ builder.copy(&path, &sysroot.join("lib").join(path.file_name().unwrap()));
+ }
+ }
+ }
+
+ // Copy codegen-backends from stage0
+ let sysroot_codegen_backends = builder.sysroot_codegen_backends(compiler);
+ t!(fs::create_dir_all(&sysroot_codegen_backends));
+ let stage0_codegen_backends = builder
+ .out
+ .join(&host)
+ .join("stage0/lib/rustlib")
+ .join(&host)
+ .join("codegen-backends");
+ builder.cp_r(&stage0_codegen_backends, &sysroot_codegen_backends);
+ }
}
}