Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/rust/patches/rust-1.75.0-0001-bootstrap-Change-libexec-dir.patch

    Contents of /trunk/rust/patches/rust-1.75.0-0001-bootstrap-Change-libexec-dir.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 3809 - (show annotations) (download)
    Thu Jan 4 09:15:38 2024 UTC (5 months, 1 week ago) by niro
    File size: 1738 byte(s) 
    -rediffed for rustc-1.75.0
    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/src/core/build_steps/dist.rs | 2 +-
    8 src/bootstrap/src/core/build_steps/tool.rs | 2 +-
    9 2 files changed, 2 insertions(+), 2 deletions(-)
    10
    11 diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs
    12 index c485481b9a1e..1a1b3a2ee39a 100644
    13 --- a/src/bootstrap/src/core/build_steps/dist.rs
    14 +++ b/src/bootstrap/src/core/build_steps/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/src/core/build_steps/tool.rs b/src/bootstrap/src/core/build_steps/tool.rs
    25 index d1bc05e51d73..6a7b788a3c4f 100644
    26 --- a/src/bootstrap/src/core/build_steps/tool.rs
    27 +++ b/src/bootstrap/src/core/build_steps/tool.rs
    28 @@ -691,7 +691,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