From: Russ Cox Date: Mon, 30 Jul 2012 04:22:42 +0000 (-0400) Subject: cmd/go: show $GOPATH in 'go env' output X-Git-Tag: go1.1rc2~2747 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=7711e61031ef20dfa802a53e7c5eb932454112db;p=gostls13.git cmd/go: show $GOPATH in 'go env' output Also, sort output. R=golang-dev, patrick, dave, iant CC=golang-dev, patrick https://golang.org/cl/6446064 --- diff --git a/src/cmd/go/env.go b/src/cmd/go/env.go index d5b0348096..3e51674f75 100644 --- a/src/cmd/go/env.go +++ b/src/cmd/go/env.go @@ -6,6 +6,7 @@ package main import ( "fmt" + "os" "runtime" "strings" ) @@ -33,16 +34,17 @@ func mkEnv() []envVar { b.init() env := []envVar{ - {"GOROOT", goroot}, - {"GOBIN", gobin}, {"GOARCH", goarch}, + {"GOBIN", gobin}, {"GOCHAR", archChar}, - {"GOOS", goos}, {"GOEXE", exeSuffix}, + {"GOGCCFLAGS", strings.Join(b.gccCmd(".")[3:], " ")}, {"GOHOSTARCH", runtime.GOARCH}, {"GOHOSTOS", runtime.GOOS}, + {"GOOS", goos}, + {"GOPATH", os.Getenv("GOPATH")}, + {"GOROOT", goroot}, {"GOTOOLDIR", toolDir}, - {"GOGCCFLAGS", strings.Join(b.gccCmd(".")[3:], " ")}, } if buildContext.CgoEnabled {