diff --git a/src/lib.rs b/src/lib.rs
index cee1f202..2455c4a9 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2291,11 +2291,31 @@ impl Build {
             "powerpc-unknown-netbsd" => Some("powerpc--netbsd"),
             "powerpc64-unknown-linux-gnu" => Some("powerpc-linux-gnu"),
             "powerpc64le-unknown-linux-gnu" => Some("powerpc64le-linux-gnu"),
-            "riscv32i-unknown-none-elf" => Some("riscv32-unknown-elf"),
-            "riscv32imac-unknown-none-elf" => Some("riscv32-unknown-elf"),
-            "riscv32imc-unknown-none-elf" => Some("riscv32-unknown-elf"),
-            "riscv64gc-unknown-none-elf" => Some("riscv64-unknown-elf"),
-            "riscv64imac-unknown-none-elf" => Some("riscv64-unknown-elf"),
+            "riscv32i-unknown-none-elf" => self.find_working_gnu_prefix(&[
+                "riscv32-unknown-elf",
+                "riscv64-unknown-elf",
+                "riscv-none-embed",
+            ]),
+            "riscv32imac-unknown-none-elf" => self.find_working_gnu_prefix(&[
+                "riscv32-unknown-elf",
+                "riscv64-unknown-elf",
+                "riscv-none-embed",
+            ]),
+            "riscv32imc-unknown-none-elf" => self.find_working_gnu_prefix(&[
+                "riscv32-unknown-elf",
+                "riscv64-unknown-elf",
+                "riscv-none-embed",
+            ]),
+            "riscv64gc-unknown-none-elf" => self.find_working_gnu_prefix(&[
+                "riscv64-unknown-elf",
+                "riscv32-unknown-elf",
+                "riscv-none-embed",
+            ]),
+            "riscv64imac-unknown-none-elf" => self.find_working_gnu_prefix(&[
+                "riscv64-unknown-elf",
+                "riscv32-unknown-elf",
+                "riscv-none-embed",
+            ]),
             "riscv64gc-unknown-linux-gnu" => Some("riscv64-linux-gnu"),
             "s390x-unknown-linux-gnu" => Some("s390x-linux-gnu"),
             "sparc-unknown-linux-gnu" => Some("sparc-linux-gnu"),