From: Russ Cox <rsc@golang.org>
Date: Fri, 21 Sep 2012 19:54:20 +0000 (+1000)
Subject: [release-branch.go1] cmd/go: show $GOPATH in 'go env' output
X-Git-Tag: go1.0.3~126
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=19e7a721baf439db5b0538e2be444490311bfede;p=gostls13.git

[release-branch.go1] cmd/go: show $GOPATH in 'go env' output

««« backport d6d7de5aa8ed
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 {