Skip to content

Commit a5ca67b

Browse files
authored
Rollup merge of #105068 - jneem:master, r=jyn514
Run patchelf also on rust-analyzer-proc-macro-srv. On NixOS, `rust-analyzer-proc-macro-srv` needs to be `patchelf`ed just like all the other libs and binaries. With this fix, I am able to use the language server configuration recommended in [the guide](https://rustc-dev-guide.rust-lang.org/building/suggested.html#configuring-rust-analyzer-for-rustc).
2 parents 08a6c93 + 66180df commit a5ca67b

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

src/bootstrap/bootstrap.py

+1
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,7 @@ def download_toolchain(self):
441441

442442
self.fix_bin_or_dylib("{}/bin/rustc".format(bin_root))
443443
self.fix_bin_or_dylib("{}/bin/rustdoc".format(bin_root))
444+
self.fix_bin_or_dylib("{}/libexec/rust-analyzer-proc-macro-srv".format(bin_root))
444445
lib_dir = "{}/lib".format(bin_root)
445446
for lib in os.listdir(lib_dir):
446447
if lib.endswith(".so"):

src/bootstrap/download.rs

+1
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,7 @@ impl Config {
360360

361361
self.fix_bin_or_dylib(&bin_root.join("bin").join("rustc"));
362362
self.fix_bin_or_dylib(&bin_root.join("bin").join("rustdoc"));
363+
self.fix_bin_or_dylib(&bin_root.join("libexec").join("rust-analyzer-proc-macro-srv"));
363364
let lib_dir = bin_root.join("lib");
364365
for lib in t!(fs::read_dir(&lib_dir), lib_dir.display().to_string()) {
365366
let lib = t!(lib);

0 commit comments

Comments
 (0)