diff --git a/cc/stl.go b/cc/stl.go
index 8f92dcb..ffc7c76 100644
--- a/cc/stl.go
+++ b/cc/stl.go
@@ -80,7 +80,8 @@
 			return ""
 		}
 		s = deduplicateStlInput(s)
-		if ctx.useSdk() && ctx.Device() {
+		archHasNDKStl := ctx.Arch().ArchType != android.Riscv64
+		if ctx.useSdk() && ctx.Device() && archHasNDKStl {
 			switch s {
 			case "", "system":
 				return "ndk_system"