37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
|
|
Date: Thu, 6 May 2021 20:14:58 +0200
|
|
Subject: [PATCH] bootstrap: Change libexec dir
|
|
|
|
---
|
|
src/bootstrap/dist.rs | 2 +-
|
|
src/bootstrap/tool.rs | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
|
|
index 32da4ac29a46..78a5faeae04b 100644
|
|
--- a/src/bootstrap/dist.rs
|
|
+++ b/src/bootstrap/dist.rs
|
|
@@ -423,7 +423,7 @@ fn prepare_image(builder: &Builder<'_>, compiler: Compiler, image: &Path) {
|
|
},
|
|
builder.kind,
|
|
) {
|
|
- builder.install(&ra_proc_macro_srv, &image.join("libexec"), 0o755);
|
|
+ builder.install(&ra_proc_macro_srv, &image.join("lib"), 0o755);
|
|
}
|
|
|
|
let libdir_relative = builder.libdir_relative(compiler);
|
|
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
|
|
index e6d27757ac66..70e499bdabbe 100644
|
|
--- a/src/bootstrap/tool.rs
|
|
+++ b/src/bootstrap/tool.rs
|
|
@@ -689,7 +689,7 @@ fn run(self, builder: &Builder<'_>) -> Option<PathBuf> {
|
|
|
|
// 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"));
|
|
|