opt/rust/0001-bootstrap-Change-libexec-dir.patch

27 lines
1.3 KiB
Diff
Raw Normal View History

2023-12-28 23:19:39 +01:00
diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs
2023-10-06 14:29:02 +02:00
index 32da4ac29a46..78a5faeae04b 100644
2023-12-28 23:19:39 +01:00
--- a/src/bootstrap/src/core/build_steps/dist.rs
+++ b/src/bootstrap/src/core/build_steps/dist.rs
2023-10-06 14:29:02 +02:00
@@ -423,7 +423,7 @@ fn prepare_image(builder: &Builder<'_>, compiler: Compiler, image: &Path) {
2023-04-20 21:08:29 +02:00
},
builder.kind,
) {
- builder.install(&ra_proc_macro_srv, &image.join("libexec"), 0o755);
+ builder.install(&ra_proc_macro_srv, &image.join("lib"), 0o755);
}
2022-11-19 20:37:42 +01:00
let libdir_relative = builder.libdir_relative(compiler);
2023-12-28 23:19:39 +01:00
diff --git a/src/bootstrap/src/core/build_steps/tool.rs b/src/bootstrap/src/core/build_steps/tool.rs
2023-10-06 14:29:02 +02:00
index e6d27757ac66..70e499bdabbe 100644
2023-12-28 23:19:39 +01:00
--- a/src/bootstrap/src/core/build_steps/tool.rs
+++ b/src/bootstrap/src/core/build_steps/tool.rs
2023-10-06 14:29:02 +02:00
@@ -689,7 +689,7 @@ fn run(self, builder: &Builder<'_>) -> Option<PathBuf> {
2022-12-17 12:40:44 +01:00
// Copy `rust-analyzer-proc-macro-srv` to `<sysroot>/libexec/`
// so that r-a can use it.
- let libexec_path = builder.sysroot(self.compiler).join("libexec");
+ let libexec_path = builder.sysroot(self.compiler).join("lib");
t!(fs::create_dir_all(&libexec_path));
builder.copy(&path, &libexec_path.join("rust-analyzer-proc-macro-srv"));