mirror of
https://github.com/esp-rs/espup.git
synced 2025-09-26 20:30:28 +00:00
Update LLVM and GCC (#527)
* feat: Update LLVM * docs: Udpate changelog * feat: Updated GCC
This commit is contained in:
parent
265b643fc7
commit
18e708de3e
@ -10,11 +10,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
### Added
|
||||
- Added option to specify Crosstool-NG version, using `-c` or `--crosstools-toolchain-version`
|
||||
- Added an option for [NuShell](https://www.nushell.sh/) completion
|
||||
- Add support for LLVM esp-20.1.1_20250829 (#527)
|
||||
|
||||
|
||||
### Fixed
|
||||
|
||||
### Changed
|
||||
- Updated default GCC / Crosstools version to latest, [`esp-14.2.0_20241119`](https://github.com/espressif/crosstool-NG/releases/tag/esp-14.2.0_20241119) (#508)
|
||||
- Updated default GCC / Crosstools version to latest, [`esp-15.2.0_20250920`](https://github.com/espressif/crosstool-NG/releases/tag/esp-15.2.0_20250920) (#527)
|
||||
- `espup install -v` now accepts version strings with 1-4 parts. (#525)
|
||||
|
||||
### Removed
|
||||
|
@ -16,7 +16,7 @@ use std::{env, fs::File};
|
||||
use tokio::fs::remove_dir_all;
|
||||
|
||||
const DEFAULT_GCC_REPOSITORY: &str = "https://github.com/espressif/crosstool-NG/releases/download";
|
||||
const DEFAULT_GCC_RELEASE: &str = "14.2.0_20241119";
|
||||
const DEFAULT_GCC_RELEASE: &str = "15.2.0_20250920";
|
||||
pub const RISCV_GCC: &str = "riscv32-esp-elf";
|
||||
pub const XTENSA_GCC: &str = "xtensa-esp-elf";
|
||||
|
||||
|
@ -28,6 +28,8 @@ const DEFAULT_LLVM_16_VERSION: &str = "esp-16.0.4-20231113";
|
||||
const DEFAULT_LLVM_17_VERSION: &str = "esp-17.0.1_20240419";
|
||||
const DEFAULT_LLVM_18_VERSION: &str = "esp-18.1.2_20240912";
|
||||
const DEFAULT_LLVM_19_VERSION: &str = "esp-19.1.2_20250225";
|
||||
const DEFAULT_LLVM_20_VERSION: &str = "esp-20.1.1_20250829";
|
||||
|
||||
pub const CLANG_NAME: &str = "xtensa-esp32-elf-clang";
|
||||
|
||||
#[derive(Debug, Clone, Default)]
|
||||
@ -54,6 +56,7 @@ impl Llvm {
|
||||
if version == DEFAULT_LLVM_17_VERSION
|
||||
|| version == DEFAULT_LLVM_18_VERSION
|
||||
|| version == DEFAULT_LLVM_19_VERSION
|
||||
|| version == DEFAULT_LLVM_20_VERSION
|
||||
{
|
||||
let arch = match host_triple {
|
||||
HostTriple::Aarch64AppleDarwin => "aarch64-apple-darwin",
|
||||
@ -129,13 +132,18 @@ impl Llvm {
|
||||
|| (major == 1 && minor < 84)
|
||||
{
|
||||
DEFAULT_LLVM_18_VERSION.to_string()
|
||||
} else {
|
||||
} else if (major == 1 && minor == 88 && patch == 0 && subpatch == 0)
|
||||
|| (major == 1 && minor < 88)
|
||||
{
|
||||
DEFAULT_LLVM_19_VERSION.to_string()
|
||||
} else {
|
||||
DEFAULT_LLVM_20_VERSION.to_string()
|
||||
};
|
||||
|
||||
let name = if version == DEFAULT_LLVM_17_VERSION
|
||||
|| version == DEFAULT_LLVM_18_VERSION
|
||||
|| version == DEFAULT_LLVM_19_VERSION
|
||||
|| version == DEFAULT_LLVM_20_VERSION
|
||||
{
|
||||
"clang-"
|
||||
} else {
|
||||
@ -153,6 +161,7 @@ impl Llvm {
|
||||
let file_name_libs = if version != DEFAULT_LLVM_17_VERSION
|
||||
&& version != DEFAULT_LLVM_18_VERSION
|
||||
&& version != DEFAULT_LLVM_19_VERSION
|
||||
&& version != DEFAULT_LLVM_20_VERSION
|
||||
{
|
||||
format!("libs_{file_name_full}")
|
||||
} else {
|
||||
@ -250,6 +259,14 @@ impl Llvm {
|
||||
),
|
||||
"",
|
||||
);
|
||||
updated_path = updated_path.replace(
|
||||
&format!(
|
||||
"{}\\{}\\esp-clang\\bin;",
|
||||
llvm_path.display().to_string().replace('/', "\\"),
|
||||
DEFAULT_LLVM_20_VERSION,
|
||||
),
|
||||
"",
|
||||
);
|
||||
updated_path = updated_path.replace(
|
||||
&format!(
|
||||
"{}\\esp-clang\\bin;",
|
||||
|
Loading…
x
Reference in New Issue
Block a user