itsscb/espup
1
0
Fork 0
mirror of https://github.com/esp-rs/espup.git synced 2025-10-02 15:14:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: When using extended LLVM check if the include folder is present

Browse Source
This commit is contained in:
Sergio Gasquez 2023-12-05 09:33:19 +00:00 committed by Sergio Gasquez Arcos
parent 4cd89f3920
commit 025792b2b0
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/toolchain/llvm.rs
View File

@ -187,10 +187,19 @@ impl Installable for Llvm {
let mut exports: Vec<String> = Vec::new(); let mut exports: Vec<String> = Vec::new();
#[cfg(unix)] #[cfg(unix)]
let is_installed = Path::new(&self.path).exists(); let install_path = if self.extended {
Path::new(&self.path).join("esp-clang").join("include")
} else {
Path::new(&self.path).to_path_buf()
};
#[cfg(windows)] #[cfg(windows)]
let is_installed = self.path.join(&self.version).exists(); let install_path = if self.extended {
if is_installed { self.path.join(&self.version).join("include")
} else {
self.path.join(&self.version)
};
if install_path.exists() {
warn!( warn!(
"Previous installation of LLVM exists in: '{}'. Reusing this installation", "Previous installation of LLVM exists in: '{}'. Reusing this installation",
self.path.to_str().unwrap() self.path.to_str().unwrap()