runtime/cgo: fix cross-compiling windows packages

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/4073043

diff --git a/src/pkg/runtime/cgo/Makefile b/src/pkg/runtime/cgo/Makefile
index a2ce902d68f1e24666655999f13d70ea7c144552..768fe80ace23731cabf6ec381fe839744ba014fb 100644 (file)
--- a/src/pkg/runtime/cgo/Makefile
+++ b/src/pkg/runtime/cgo/Makefile
@@ -10,6 +10,10 @@ ifeq ($(GOARCH),arm)
 ENABLED:=0
 endif
 
+ifeq ($(DISABLE_CGO),1)
+ENABLED:=0
+endif
+
 TARG=runtime/cgo
 
 GOFILES=\