diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
index 9eb9e8f241..206c65f52f 100644
--- a/src/cmd/dist/build.go
+++ b/src/cmd/dist/build.go
@@ -1532,7 +1532,7 @@ var cgoEnabled = map[string]bool{
 	"linux/mipsle":    true,
 	"linux/mips64":    true,
 	"linux/mips64le":  true,
-	"linux/riscv64":   true,
+	"linux/riscv64":   false, // Issue 36641
 	"linux/s390x":     true,
 	"linux/sparc64":   true,
 	"android/386":     true,