itsscb/espup
1
0
Fork 0
mirror of https://github.com/esp-rs/espup.git synced 2025-09-29 05:40:40 +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 5a322c69c5
commit 6d16b3f5f3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main.rs
View File

@ -17,7 +17,10 @@ use espup::{
},
gcc::{get_toolchain_name, Gcc},
llvm::Llvm,
rust::{check_rust_installation, uninstall_riscv_target, Crate, RiscVTarget, XtensaRust},
rust::{
check_rust_installation, uninstall_riscv_target, uninstall_riscv_target, Crate,
RiscVTarget, XtensaRust,
},
Installable,
},
update::check_for_update,
@ -194,7 +197,7 @@ async fn install(args: InstallOpts) -> Result<()> {
to_install.push(Box::new(llvm));
if targets.contains(&Target::ESP32C3) {
if targets.contains(&Target::ESP32C3) || targets.contains(&Target::ESP32C2) {
let riscv_target = RiscVTarget::new(&args.nightly_version);
to_install.push(Box::new(riscv_target));
}
@ -330,7 +333,7 @@ async fn uninstall(args: UninstallOpts) -> Result<()> {
config.targets.remove(&Target::ESP32C3);
config.targets.remove(&Target::ESP32C2);
config.save()?;
// All RISC-V targets use the same GCC toolchain
// 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))?;