itsscb/espup
1
0
Fork 0
mirror of https://github.com/esp-rs/espup.git synced 2025-09-29 22:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 🐛 Fix riscv uninstallation

Browse Source
This commit is contained in:
Sergio Gasquez 2022-12-22 10:03:25 +00:00
parent 0ae42f5742
commit 1f8a04ec83
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main.rs
View File

@ -18,7 +18,8 @@ use espup::{
gcc::{get_toolchain_name, install_gcc_targets},
llvm::Llvm,
rust::{
check_rust_installation, install_extra_crates, install_riscv_target, Crate, XtensaRust,
check_rust_installation, install_extra_crates, install_riscv_target,
uninstall_riscv_target, Crate, XtensaRust,
},
},
update::check_for_update,
@ -189,7 +190,7 @@ fn install(args: InstallOpts) -> Result<()> {
exports.extend(llvm.install()?);
if targets.contains(&Target::ESP32C3) {
if targets.contains(&Target::ESP32C3) || targets.contains(&Target::ESP32C2) {
install_riscv_target(&args.nightly_version)?;
}
@ -273,6 +274,11 @@ fn uninstall(args: UninstallOpts) -> Result<()> {
.map_err(|_| Error::FailedToRemoveDirectory(llvm_path.display().to_string()))?;
}
if config.targets.contains(&Target::ESP32C3) || config.targets.contains(&Target::ESP32C2) {
info!("{} Deleting RISC-V target", emoji::WRENCH);
uninstall_riscv_target(&config.nightly_version)?;
}
if let Some(esp_idf_version) = config.esp_idf_version {
info!("{} Deleting ESP-IDF {}", emoji::WRENCH, esp_idf_version);
config.esp_idf_version = None;
@ -293,6 +299,15 @@ fn uninstall(args: UninstallOpts) -> Result<()> {
})?;
} else {
info!("{} Deleting GCC targets", emoji::WRENCH);
if config.targets.contains(&Target::ESP32C3) || config.targets.contains(&Target::ESP32C2) {
config.targets.remove(&Target::ESP32C3);
config.targets.remove(&Target::ESP32C2);
config.save()?;
// All RiscV targets use the same GCC toolchain
let riscv_gcc_path = get_tool_path(&get_toolchain_name(&Target::ESP32C3));
remove_dir_all(&riscv_gcc_path)
.map_err(|_| Error::FailedToRemoveDirectory(riscv_gcc_path))?;
}
for target in &config.targets.clone() {
config.targets.remove(target);
config.save()?;

16
src/toolchain/rust.rs
View File

@ -409,6 +409,22 @@ fn install_rust_nightly(version: &str) -> Result<()> {
Ok(())
}
/// Unnstalls the RiscV target.
pub fn uninstall_riscv_target(nightly_version: &str) -> Result<()> {
info!("{} Installing Riscv target", emoji::WRENCH);
cmd!(
"rustup",
"target",
"remove",
"--toolchain",
nightly_version,
"riscv32imac-unknown-none-elf"
)
.run()
.into_diagnostic()?;
Ok(())
}
#[cfg(test)]
mod tests {
use crate::toolchain::rust::{Crate, XtensaRust};