From: Alex Brainman <alex.brainman@gmail.com>
Date: Sat, 29 Jan 2011 11:57:19 +0000 (+1100)
Subject: runtime/cgo: fix cross-compiling windows packages
X-Git-Tag: weekly.2011-02-01~46
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=89cc4d78146b6969e94ee15c929a7db0a635f20d;p=gostls13.git

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 a2ce902d68..768fe80ace 100644
--- 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=\