From 3ded88a65c60cb2f610c4306e45165d45e46bfa3 Mon Sep 17 00:00:00 2001
From: Scott Mabin <scott@mabez.dev>
Date: Fri, 20 Aug 2021 14:21:24 +0100
Subject: [PATCH] Fix esp32c3 build by moving to the new upstream target,
 riscv32imc-esp-espidf.

---
 components/rustlib/CMakeLists.txt | 2 +-
 components/rustlib/build.rs       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/rustlib/CMakeLists.txt b/components/rustlib/CMakeLists.txt
index 7ae6a34..cc52fee 100644
--- a/components/rustlib/CMakeLists.txt
+++ b/components/rustlib/CMakeLists.txt
@@ -9,7 +9,7 @@ idf_component_register(
 set(CARGO_BUILD_TYPE "release")
 set(CARGO_BUILD_ARG "--release")
 if(CONFIG_IDF_TARGET_ARCH_RISCV)
-    set(CARGO_TARGET "riscv32i-unknown-none-elf")
+    set(CARGO_TARGET "riscv32imc-esp-espidf")
     set(CARGO_FEATURES_ARG "")
 elseif(CONFIG_IDF_TARGET_ARCH_XTENSA)
     set(CARGO_TARGET "xtensa-esp32-espidf")
diff --git a/components/rustlib/build.rs b/components/rustlib/build.rs
index b665ac9..ab96fa4 100644
--- a/components/rustlib/build.rs
+++ b/components/rustlib/build.rs
@@ -32,7 +32,7 @@ fn run_bindgen(target: &str, out_dir: &Path) {
     let mut builder = bindgen::Builder::default();
     builder = builder.header(header);
     match target {
-        "riscv32i-unknown-none-elf" => {
+        "riscv32imc-esp-espidf" => {
             builder = builder.clang_arg("--target=riscv32");
             builder = builder.use_core();
             builder = builder.ctypes_prefix("crate::ffi");