itsscb/espup
1
0
Fork 0
mirror of https://github.com/esp-rs/espup.git synced 2025-09-26 20:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix extended LLVM mode for LLVM < 17 (#437)

Browse Source 
The fix for extended LLVM mode with LLVM 17 accidentally broke it for
toolchain versions using LLVM 15 and 16.

Signed-off-by: Johannes Löthberg <johannes.loethberg@elokon.com>
This commit is contained in:
Johannes Löthberg 2024-07-17 13:06:48 +02:00 committed by GitHub
parent e5bf496aaf
commit e108653b63
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]
### Fixed
- Fix extended LLVM mode regression for LLVM versions < 17 introduced by #432. (#437)
## [0.12.1] - 2024-07-15
### Fixed

27
src/toolchain/llvm.rs
View File

@ -33,7 +33,7 @@ pub struct Llvm {
// /// If `true`, full LLVM, instead of only libraries, are installed.
extended: bool,
/// LLVM libs-only toolchain file name.
pub file_name_libs: String,
pub file_name_libs: Option<String>,
/// LLVM "full" toolchain file name.
pub file_name_full: Option<String>,
/// Host triple.
@ -140,14 +140,23 @@ impl Llvm {
format!("libs-{file_name_full}")
};
(
file_name_libs,
// For LLVM 15 and 16 the "full" tarball was a superset of the "libs" tarball, so if
// we're in extended LLVM mode we only need the "full" tarballs for those versions.
//
// Later LLVM versions are built such that the "full" tarball has a statically linked
// `clang` binary and therefore doesn't contain libclang, and so then we need to fetch
// both tarballs.
if version == DEFAULT_LLVM_15_VERSION || version == DEFAULT_LLVM_16_VERSION {
None
if extended {
(None, Some(file_name_full))
} else {
extended.then_some(file_name_full)
},
)
(Some(file_name_libs), None)
}
} else if extended {
(Some(file_name_libs), Some(file_name_full))
} else {
(Some(file_name_libs), None)
}
};
let repository_url = format!("{DEFAULT_LLVM_REPOSITORY}/{version}");
@ -260,14 +269,16 @@ impl Installable for Llvm {
);
} else {
info!("Installing Xtensa LLVM");
if let Some(file_name_libs) = &self.file_name_libs {
download_file(
format!("{}/{}", self.repository_url, self.file_name_libs),
format!("{}/{}", self.repository_url, file_name_libs),
"idf_tool_xtensa_elf_clang.libs.tar.xz",
self.path.to_str().unwrap(),
true,
false,
)
.await?;
}
if let Some(file_name_full) = &self.file_name_full {
download_file(
format!("{}/{}", self.repository_url, file_name_full),