commit d7e3e0097219e150fdd4256f468a2791a5add0ce Author: Tim Biermann <tbier@posteo.de> Date: Sat Nov 19 19:37:42 2022 +0000 rust: moved libexec dir diff --git a/rust/.footprint b/rust/.footprint index 7397901fa..faf200440 100644 --- a/rust/.footprint +++ b/rust/.footprint @@ -17,9 +17,7 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/rustfmt drwxr-xr-x root/root usr/lib/ -rwxr-xr-x root/root usr/lib/cargo-credential-1password --rw-r--r-- root/root usr/lib/librustc_driver-c7468396226a1d22.so --rw-r--r-- root/root usr/lib/libstd-28554cbcb9fbdebc.so --rw-r--r-- root/root usr/lib/libtest-03b553922fa4cc00.so +-rwxr-xr-x root/root usr/lib/rust-analyzer-proc-macro-srv drwxr-xr-x root/root usr/lib/rustlib/ drwxr-xr-x root/root usr/lib/rustlib/etc/ -rw-r--r-- root/root usr/lib/rustlib/etc/gdb_load_rust_pretty_printers.py @@ -31,61 +29,7 @@ drwxr-xr-x root/root usr/lib/rustlib/etc/ -rw-r--r-- root/root usr/lib/rustlib/etc/rust_types.py drwxr-xr-x root/root usr/lib/rustlib/i686-unknown-linux-gnu/ drwxr-xr-x root/root usr/lib/rustlib/i686-unknown-linux-gnu/analysis/ --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/analysis/libaddr2line-49863d79bae0351e.json --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/analysis/libadler-0b64d591b9630f4a.json --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/analysis/liballoc-02bb461d7a93cd18.json --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/analysis/libcfg_if-175c22ebaecb3a04.json --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/analysis/libcompiler_builtins-d6946d20ec7902c7.json --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/analysis/libcore-68e7628a094e69a8.json --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/analysis/libgetopts-fc552e9c132a9c38.json --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/analysis/libgimli-2ea34024b703a8fd.json --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/analysis/libhashbrown-ab99e46290e24ea5.json --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/analysis/liblibc-0d1ad07d96a7e1dc.json --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/analysis/libmemchr-0b2cc31eab72b212.json --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/analysis/libminiz_oxide-10e4e1940b1718ce.json --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/analysis/libobject-e14a5e7f816b2e62.json --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/analysis/libpanic_abort-7e35f4199c976c27.json --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/analysis/libpanic_unwind-f845faa38317747b.json --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/analysis/libproc_macro-45ab51dc4a054ddf.json --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/analysis/libprofiler_builtins-86226cad50235cd4.json --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/analysis/librustc_demangle-39c6d164059d5d91.json --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/analysis/librustc_std_workspace_alloc-def52c7503432a7c.json --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/analysis/librustc_std_workspace_core-b6621e53e59b04ec.json --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/analysis/librustc_std_workspace_std-9dcb08bda26d2623.json --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/analysis/libstd-64144ff93408b025.json --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/analysis/libstd_detect-76d61b2d4f68a947.json --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/analysis/libtest-0db98a5c0266debe.json --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/analysis/libunicode_width-6e8fdf07edcff414.json --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/analysis/libunwind-12066f29e7e76043.json drwxr-xr-x root/root usr/lib/rustlib/i686-unknown-linux-gnu/lib/ --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/lib/libaddr2line-49863d79bae0351e.rlib --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/lib/libadler-0b64d591b9630f4a.rlib --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/lib/liballoc-02bb461d7a93cd18.rlib --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcfg_if-175c22ebaecb3a04.rlib --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcompiler_builtins-d6946d20ec7902c7.rlib --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcore-68e7628a094e69a8.rlib --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/lib/libgetopts-fc552e9c132a9c38.rlib --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/lib/libgimli-2ea34024b703a8fd.rlib --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/lib/libhashbrown-ab99e46290e24ea5.rlib --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/lib/liblibc-0d1ad07d96a7e1dc.rlib --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/lib/libmemchr-0b2cc31eab72b212.rlib --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/lib/libminiz_oxide-10e4e1940b1718ce.rlib --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/lib/libobject-e14a5e7f816b2e62.rlib --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/lib/libpanic_abort-7e35f4199c976c27.rlib --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/lib/libpanic_unwind-f845faa38317747b.rlib --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/lib/libproc_macro-45ab51dc4a054ddf.rlib --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/lib/libprofiler_builtins-86226cad50235cd4.rlib --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_demangle-39c6d164059d5d91.rlib --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_alloc-def52c7503432a7c.rlib --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_core-b6621e53e59b04ec.rlib --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_std-9dcb08bda26d2623.rlib --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/lib/libstd-64144ff93408b025.rlib --rwxr-xr-x root/root usr/lib/rustlib/i686-unknown-linux-gnu/lib/libstd-64144ff93408b025.so --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/lib/libstd_detect-76d61b2d4f68a947.rlib --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/lib/libtest-0db98a5c0266debe.rlib --rwxr-xr-x root/root usr/lib/rustlib/i686-unknown-linux-gnu/lib/libtest-0db98a5c0266debe.so --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/lib/libunicode_width-6e8fdf07edcff414.rlib --rw-r--r-- root/root usr/lib/rustlib/i686-unknown-linux-gnu/lib/libunwind-12066f29e7e76043.rlib -rw-r--r-- root/root usr/lib/rustlib/install.log -rw-r--r-- root/root usr/lib/rustlib/manifest-cargo -rw-r--r-- root/root usr/lib/rustlib/manifest-clippy-preview @@ -1958,67 +1902,11 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/li -rw-r--r-- root/root usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/unwind_leaffunction.pass.cpp drwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/ drwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/ --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/libaddr2line-41a6e9be38c691d2.json --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/libadler-6453a0ec96cf4517.json --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/liballoc-efcd7f50b67d8fd8.json --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/libcfg_if-5c475d6751725b4f.json --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/libcompiler_builtins-63d35e36f1a9148b.json --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/libcore-b04c3fc8fa2fc1be.json --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/libgetopts-4d0bab03bbe9efed.json --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/libgimli-fb0cc4ea16e6a9a6.json --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/libhashbrown-f3061b2452141667.json --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/liblibc-28d5fdb15c0e2ad7.json --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/libmemchr-7a6f92cdecfb35de.json --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/libminiz_oxide-2068508cd1199de4.json --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/libobject-c997a9df00070314.json --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/libpanic_abort-feb2a9bf974cc109.json --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/libpanic_unwind-58fc02af5d87da4e.json --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/libproc_macro-780f0712adfc7c3b.json --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/libprofiler_builtins-730c8e03eae75947.json --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/librustc_demangle-5c9b2d808ef08846.json --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/librustc_std_workspace_alloc-53bba13a089af9c8.json --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/librustc_std_workspace_core-4177cf6cb3603b58.json --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/librustc_std_workspace_std-82312516aa36b57e.json --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/libstd-28554cbcb9fbdebc.json --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/libstd_detect-93aedf6018d06baa.json --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/libtest-03b553922fa4cc00.json --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/libunicode_width-a124a1b5053b4ebb.json --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/libunwind-fa12dc242112f0f4.json drwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/ --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libaddr2line-41a6e9be38c691d2.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libadler-6453a0ec96cf4517.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liballoc-efcd7f50b67d8fd8.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcfg_if-5c475d6751725b4f.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins-63d35e36f1a9148b.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-b04c3fc8fa2fc1be.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgetopts-4d0bab03bbe9efed.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgimli-fb0cc4ea16e6a9a6.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libhashbrown-f3061b2452141667.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-28d5fdb15c0e2ad7.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libmemchr-7a6f92cdecfb35de.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libminiz_oxide-2068508cd1199de4.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libobject-c997a9df00070314.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_abort-feb2a9bf974cc109.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_unwind-58fc02af5d87da4e.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libproc_macro-780f0712adfc7c3b.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libprofiler_builtins-730c8e03eae75947.rlib -rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.asan.a -rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.lsan.a -rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.msan.a -rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.tsan.a --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_demangle-5c9b2d808ef08846.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_alloc-53bba13a089af9c8.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_core-4177cf6cb3603b58.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_std-82312516aa36b57e.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-28554cbcb9fbdebc.rlib --rwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-28554cbcb9fbdebc.so --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd_detect-93aedf6018d06baa.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-03b553922fa4cc00.rlib --rwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-03b553922fa4cc00.so --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunicode_width-a124a1b5053b4ebb.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunwind-fa12dc242112f0f4.rlib -drwxr-xr-x root/root usr/libexec/ --rwxr-xr-x root/root usr/libexec/rust-analyzer-proc-macro-srv drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man1/ diff --git a/rust/.signature b/rust/.signature index d0beb1011..a1d7d0c04 100644 --- a/rust/.signature +++ b/rust/.signature @@ -1,11 +1,11 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/TCZgHJQQslALlIpc7Mkb2teBGgXkjupK0I2yfOKag9gEIuJAC2X8ELkIufLIUSqY+E4nI+Jg2+HA5YFbZW2yAE= +RWSE3ohX2g5d/aD31oGoht61xP7Ry7lW2eerozzowD6k4CeBnLSopcGw5l4zJNTaJNuWppNCyPsNhBxgGfBkHaF/k0+gn8Vo1Qs= SHA256 (Pkgfile) = dc7f029ec4d52609b5c3cfbf8fccc89af2954219692bd43b042ddab84c7e07f9 -SHA256 (.footprint) = 9315b931e1027239d5078448cb1d589bfca57f3efdd6c9f1a97a21d5abff67e3 +SHA256 (.footprint) = 3a831b96dc6981348c290e37fb02264ccc1bb61fd004fe77417f9f0531eaade4 SHA256 (rustc-1.65.0-src.tar.xz) = 2d6aa2ea3fedd55acbbd65f78349385f9daa9c14e25db7a8df5d015588eee1cf SHA256 (rust-std-1.64.0-x86_64-unknown-linux-gnu.tar.xz) = 6ace34bcbba9557aa2fc3a0515c3da4a83ca24d7d45506c5e1b32f589fa38a8b SHA256 (rustc-1.64.0-x86_64-unknown-linux-gnu.tar.xz) = 1f5756a03119853b53358018c5b1592940a2354c3c9f84ee7faf684e3478f8f0 SHA256 (cargo-1.64.0-x86_64-unknown-linux-gnu.tar.xz) = 21434d83a30ad3fa4e4831487c5574a20b07dd57d213b26e1246290c57d4ec41 -SHA256 (0001-bootstrap-Change-libexec-dir.patch) = 60c6dfc100d292284af2187cfefc1d0d928139ca557d27bc6bef88edefccff70 +SHA256 (0001-bootstrap-Change-libexec-dir.patch) = c88389c7ac2ce832c39450171af8fbd9bfe26f8e683f28b776b492c972fda359 SHA256 (0001-cargo-Change-libexec-dir.patch) = c901a9bb036c29ca092f7dbc8b447efdd9aa1044a902a88f9d024cb22681dc19 SHA256 (0002-compiler-Change-LLVM-targets.patch) = 8dcb566da29a92ecf3eb6afe094d9c7766d08230d90fd666bfd022c018ae676a diff --git a/rust/0001-bootstrap-Change-libexec-dir.patch b/rust/0001-bootstrap-Change-libexec-dir.patch index 4411b46b7..8d81b3a9b 100644 --- a/rust/0001-bootstrap-Change-libexec-dir.patch +++ b/rust/0001-bootstrap-Change-libexec-dir.patch @@ -4,14 +4,24 @@ Date: Thu, 6 May 2021 20:14:58 +0200 Subject: [PATCH] bootstrap: Change libexec dir --- - src/bootstrap/dist.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/bootstrap/dist.rs | 4 ++-- + src/tools/rust-analyzer/crates/rust-analyzer/src/reload.rs | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs -index be965971dbb6..f3fa15a8e2de 100644 +index 1a59b3958f10..6e650d286d8f 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs -@@ -976,7 +976,7 @@ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> { +@@ -372,7 +372,7 @@ fn prepare_image(builder: &Builder<'_>, compiler: Compiler, image: &Path) { + target: compiler.host, + }) + .expect("rust-analyzer-proc-macro-server always builds"); +- 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); + +@@ -980,7 +980,7 @@ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> { for dirent in fs::read_dir(cargo.parent().unwrap()).expect("read_dir") { let dirent = dirent.expect("read dir entry"); if dirent.file_name().to_str().expect("utf8").starts_with("cargo-credential-") { @@ -20,3 +30,16 @@ index be965971dbb6..f3fa15a8e2de 100644 } } +diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/src/reload.rs b/src/tools/rust-analyzer/crates/rust-analyzer/src/reload.rs +index e47f70fff39e..78c2a65aee8b 100644 +--- a/src/tools/rust-analyzer/crates/rust-analyzer/src/reload.rs ++++ b/src/tools/rust-analyzer/crates/rust-analyzer/src/reload.rs +@@ -321,7 +321,7 @@ fn eq_ignore_build_data<'a>( + if let Some(sysroot) = sysroot.as_ref() { + tracing::debug!("Found a cargo workspace with a sysroot..."); + let server_path = +- sysroot.root().join("libexec").join(&standalone_server_name); ++ sysroot.root().join("lib").join(&standalone_server_name); + if std::fs::metadata(&server_path).is_ok() { + tracing::debug!( + "And the server exists at {}",