Annotation of /trunk/rust/patches/rust-1.73.0-0001-bootstrap-Change-libexec-dir.patch
Parent Directory | Revision Log
Revision 3792 -
(hide annotations)
(download)
Thu Oct 19 14:30:57 2023 UTC (7 months, 4 weeks ago) by niro
File size: 1528 byte(s)
Thu Oct 19 14:30:57 2023 UTC (7 months, 4 weeks ago) by niro
File size: 1528 byte(s)
-rediffed for 1.73.0
1 | niro | 3792 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
2 | From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org> | ||
3 | Date: Thu, 6 May 2021 20:14:58 +0200 | ||
4 | Subject: [PATCH] bootstrap: Change libexec dir | ||
5 | |||
6 | --- | ||
7 | src/bootstrap/dist.rs | 2 +- | ||
8 | src/bootstrap/tool.rs | 2 +- | ||
9 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
10 | |||
11 | diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs | ||
12 | index 32da4ac29a46..78a5faeae04b 100644 | ||
13 | --- a/src/bootstrap/dist.rs | ||
14 | +++ b/src/bootstrap/dist.rs | ||
15 | @@ -423,7 +423,7 @@ fn prepare_image(builder: &Builder<'_>, compiler: Compiler, image: &Path) { | ||
16 | }, | ||
17 | builder.kind, | ||
18 | ) { | ||
19 | - builder.install(&ra_proc_macro_srv, &image.join("libexec"), 0o755); | ||
20 | + builder.install(&ra_proc_macro_srv, &image.join("lib"), 0o755); | ||
21 | } | ||
22 | |||
23 | let libdir_relative = builder.libdir_relative(compiler); | ||
24 | diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs | ||
25 | index e6d27757ac66..70e499bdabbe 100644 | ||
26 | --- a/src/bootstrap/tool.rs | ||
27 | +++ b/src/bootstrap/tool.rs | ||
28 | @@ -689,7 +689,7 @@ fn run(self, builder: &Builder<'_>) -> Option<PathBuf> { | ||
29 | |||
30 | // Copy `rust-analyzer-proc-macro-srv` to `<sysroot>/libexec/` | ||
31 | // so that r-a can use it. | ||
32 | - let libexec_path = builder.sysroot(self.compiler).join("libexec"); | ||
33 | + let libexec_path = builder.sysroot(self.compiler).join("lib"); | ||
34 | t!(fs::create_dir_all(&libexec_path)); | ||
35 | builder.copy(&path, &libexec_path.join("rust-analyzer-proc-macro-srv")); | ||
36 |