about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoe Neeman <joeneeman@gmail.com>2022-11-29 14:33:55 -0600
committerJoe Neeman <joeneeman@gmail.com>2022-11-29 14:36:52 -0600
commit66180dfad8999661068ab7065b379fa044a114c6 (patch)
treeebed915362d7d27ce64893cbcbf6ac1f3b3f2354
parente0098a5cc3a87d857e597af824d0ce1ed1ad85e0 (diff)
downloadrust-66180dfad8999661068ab7065b379fa044a114c6.tar.gz
rust-66180dfad8999661068ab7065b379fa044a114c6.zip
Run patchelf also on rust-analyzer-proc-macro-srv.
-rw-r--r--src/bootstrap/bootstrap.py1
-rw-r--r--src/bootstrap/download.rs1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
index 57128685d91..2d5018d934e 100644
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -441,6 +441,7 @@ class RustBuild(object):
 
             self.fix_bin_or_dylib("{}/bin/rustc".format(bin_root))
             self.fix_bin_or_dylib("{}/bin/rustdoc".format(bin_root))
+            self.fix_bin_or_dylib("{}/libexec/rust-analyzer-proc-macro-srv".format(bin_root))
             lib_dir = "{}/lib".format(bin_root)
             for lib in os.listdir(lib_dir):
                 if lib.endswith(".so"):
diff --git a/src/bootstrap/download.rs b/src/bootstrap/download.rs
index d0f389df973..6ae283f32a5 100644
--- a/src/bootstrap/download.rs
+++ b/src/bootstrap/download.rs
@@ -360,6 +360,7 @@ impl Config {
 
             self.fix_bin_or_dylib(&bin_root.join("bin").join("rustc"));
             self.fix_bin_or_dylib(&bin_root.join("bin").join("rustdoc"));
+            self.fix_bin_or_dylib(&bin_root.join("libexec").join("rust-analyzer-proc-macro-srv"));
             let lib_dir = bin_root.join("lib");
             for lib in t!(fs::read_dir(&lib_dir), lib_dir.display().to_string()) {
                 let lib = t!(lib);