From fb2e3b82f47dc9be89821d16f609df65e1f5f6ab Mon Sep 17 00:00:00 2001
From: Joel Sing <joel@sing.id.au>
Date: Thu, 23 Jan 2020 03:46:00 +1100
Subject: [PATCH] cmd/dist: mark cgo as disabled on linux/riscv64

cgo is not currently supported on this platform.

Updates #27532 and #36641

Change-Id: I4b35f887e869ebc5c156dd754b1c79897a8c5800
Reviewed-on: https://go-review.googlesource.com/c/go/+/215838
Reviewed-by: Cherry Zhang <cherryyz@google.com>
---
 src/cmd/dist/build.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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,
-- 
2.48.1