language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-26 11:59:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: rust-project.json projects not preferring sysroot rustc

Browse source
This commit is contained in:
Lukas Wirth 2024-02-27 10:20:07 +01:00
parent d4d9d0c85a
commit 64c17a9b2e
6 changed files with 25 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/project-model/src/sysroot.rs
View file

@ -199,6 +199,19 @@ impl Sysroot {
}
}
/// Returns a `Command` that is configured to run `rustc` from the sysroot if it exists,
/// otherwise returns what [toolchain::Tool::Rustc] returns.
pub fn rustc(sysroot: Option<&Self>) -> Command {
let mut cmd = Command::new(match sysroot {
Some(sysroot) => {
toolchain::Tool::Rustc.path_in_or_discover(sysroot.root.join("bin").as_ref())
}
None => toolchain::Tool::Rustc.path(),
});
Self::set_rustup_toolchain_env(&mut cmd, sysroot);
cmd
}
pub fn discover_proc_macro_srv(&self) -> anyhow::Result<AbsPathBuf> {
["libexec", "lib"]
.into_iter()