Contents of /trunk/rust/patches/rust-1.71.1-0001-bootstrap-Change-libexec-dir.patch
Parent Directory | Revision Log
Revision 3755 -
(show annotations)
(download)
Sun Aug 6 10:48:54 2023 UTC (9 months, 2 weeks ago) by niro
File size: 2015 byte(s)
Sun Aug 6 10:48:54 2023 UTC (9 months, 2 weeks ago) by niro
File size: 2015 byte(s)
-rust-1.71.1 archlinux patches
1 | 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 | 4 ++-- |
8 | src/bootstrap/tool.rs | 2 +- |
9 | 2 files changed, 3 insertions(+), 3 deletions(-) |
10 | |
11 | diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs |
12 | index 9cead7adc8c3..fc353c39cca1 100644 |
13 | --- a/src/bootstrap/dist.rs |
14 | +++ b/src/bootstrap/dist.rs |
15 | @@ -420,7 +420,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 | @@ -1078,7 +1078,7 @@ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> { |
25 | for dirent in fs::read_dir(cargo.parent().unwrap()).expect("read_dir") { |
26 | let dirent = dirent.expect("read dir entry"); |
27 | if dirent.file_name().to_str().expect("utf8").starts_with("cargo-credential-") { |
28 | - tarball.add_file(&dirent.path(), "libexec", 0o755); |
29 | + tarball.add_file(&dirent.path(), "lib", 0o755); |
30 | } |
31 | } |
32 | |
33 | diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs |
34 | index b3791efaf58c..dd2e2eaea705 100644 |
35 | --- a/src/bootstrap/tool.rs |
36 | +++ b/src/bootstrap/tool.rs |
37 | @@ -719,7 +719,7 @@ fn run(self, builder: &Builder<'_>) -> Option<PathBuf> { |
38 | |
39 | // Copy `rust-analyzer-proc-macro-srv` to `<sysroot>/libexec/` |
40 | // so that r-a can use it. |
41 | - let libexec_path = builder.sysroot(self.compiler).join("libexec"); |
42 | + let libexec_path = builder.sysroot(self.compiler).join("lib"); |
43 | t!(fs::create_dir_all(&libexec_path)); |
44 | builder.copy(&path, &libexec_path.join("rust-analyzer-proc-macro-srv")); |
45 |