]> Cypherpunks repositories - gostls13.git/commitdiff
env.bash: export CGO_ENABLED so cgo tests run
authorAlex Brainman <alex.brainman@gmail.com>
Mon, 12 Dec 2011 23:47:51 +0000 (10:47 +1100)
committerAlex Brainman <alex.brainman@gmail.com>
Mon, 12 Dec 2011 23:47:51 +0000 (10:47 +1100)
R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/5394042

src/env.bash

index 50bc4adad664f038e695185ebf7b2b1a651676bf..3ae4f256de7695393970d3afbad4440788ef098d 100644 (file)
@@ -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.