From 6d16b3f5f3db5e99610aeabf281ecf6d8eb866d6 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Thu, 22 Dec 2022 10:03:25 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Fix=20riscv=20uninstallat?= =?UTF-8?q?ion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main.rs b/src/main.rs index 6819b1d..d593b33 100644 --- a/src/main.rs +++ b/src/main.rs @@ -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))?;