diff --git a/daemon/graphdriver/quota/projectquota.go b/daemon/graphdriver/quota/projectquota.go
index d720ac78db..550a7127b1 100644
--- a/daemon/graphdriver/quota/projectquota.go
+++ b/daemon/graphdriver/quota/projectquota.go
@@ -1,4 +1,4 @@
-// +build linux,!exclude_disk_quota
+// +build linux,!exclude_disk_quota,cgo
 
 //
 // projectquota.go - implements XFS project quota controls
diff --git a/daemon/graphdriver/quota/projectquota_unsupported.go b/daemon/graphdriver/quota/projectquota_unsupported.go
index 7422d5b432..7ccfb8c292 100644
--- a/daemon/graphdriver/quota/projectquota_unsupported.go
+++ b/daemon/graphdriver/quota/projectquota_unsupported.go
@@ -1,4 +1,4 @@
-// +build linux,exclude_disk_quota
+// +build linux,exclude_disk_quota linux,!cgo
 
 package quota // import "github.com/docker/docker/daemon/graphdriver/quota"
 
diff --git a/hack/make/.binary b/hack/make/.binary
index 2e194f2f10..d56e3f3126 100644
--- a/hack/make/.binary
+++ b/hack/make/.binary
@@ -70,9 +70,9 @@ hash_files() {
 		esac
 	fi
 
-	# -buildmode=pie is not supported on Windows and Linux on mips.
+	# -buildmode=pie is not supported on Windows and Linux on mips and riscv64.
 	case "$(go env GOOS)/$(go env GOARCH)" in
-		windows/* | linux/mips*) ;;
+		windows/* | linux/mips* | linux/riscv*) ;;
 
 		*)
 			BUILDFLAGS+=("-buildmode=pie")