From: Alex Brainman <alex.brainman@gmail.com>
Date: Mon, 12 Dec 2011 23:47:51 +0000 (+1100)
Subject: env.bash: export CGO_ENABLED so cgo tests run
X-Git-Tag: weekly.2011-12-14~72
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=53c4d81b63984fb4fa1ec91024bc2477ef4e5d6e;p=gostls13.git

env.bash: export CGO_ENABLED so cgo tests run

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

diff --git a/src/env.bash b/src/env.bash
index 50bc4adad6..3ae4f256de 100644
--- a/src/env.bash
+++ b/src/env.bash
@@ -96,7 +96,7 @@ set +o noclobber
 
 # Tried to use . <($MAKE ...) here, but it cannot set environment
 # variables in the version of bash that ships with OS X.  Amazing.
-eval $($MAKE --no-print-directory -f Make.inc go-env | egrep 'GOARCH|GOOS|GOHOSTARCH|GOHOSTOS|GO_ENV')
+eval $($MAKE --no-print-directory -f Make.inc go-env | egrep 'GOARCH|GOOS|GOHOSTARCH|GOHOSTOS|GO_ENV|CGO_ENABLED')
 
 # Shell doesn't tell us whether make succeeded,
 # so Make.inc generates a fake variable name.