--- a/src/zig/wrapper.rs
+++ b/src/zig/wrapper.rs
@@ -163,7 +163,12 @@
                         "pentium4"
                     }
                 }
+                "riscv64gc"
+                    if env::var_os("DISABLE_RVA23").as_deref() != Some(OsStr::new("1")) =>
+                {
+                    "generic_rv64+rva23u64"
+                }
                 "riscv64gc" => "generic_rv64+m+a+f+d+c",
                 "riscv64a23" => "generic_rv64+rva23u64",
                 "s390x" => "z10-vector",
                 _ => "",
--- a/src/zig/cargo_env.rs
+++ b/src/zig/cargo_env.rs
@@ -604,4 +604,7 @@
-        let toolchain_file = cmake.join(format!("{target}-toolchain.cmake"));
+        let toolchain_file = cmake.join(format!(
+            "{}-toolchain.cmake",
+            zig_wrapper.cc.file_stem().unwrap().to_string_lossy()
+        ));
         let triple: Triple = target.parse()?;
         let os = triple.operating_system.to_string();
         let arch = triple.architecture.to_string();