From: Andrew Gerrand <adg@golang.org>
Date: Tue, 30 Jun 2015 05:35:01 +0000 (+1000)
Subject: cmd/go: use GOOS and GOARCH from build context for "go generate"
X-Git-Tag: go1.5beta1~39
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=ab9c25f2de06e74cade453876835b3c1533a39de;p=gostls13.git

cmd/go: use GOOS and GOARCH from build context for "go generate"

Fixes #11438

Change-Id: Iedd31918aa5187fc3fdaed71c8dad82075559084
Reviewed-on: https://go-review.googlesource.com/11667
Reviewed-by: Rob Pike <r@golang.org>
---

diff --git a/src/cmd/go/generate.go b/src/cmd/go/generate.go
index a17f6e7747..98513ce122 100644
--- a/src/cmd/go/generate.go
+++ b/src/cmd/go/generate.go
@@ -347,9 +347,9 @@ func (g *Generator) errorf(format string, args ...interface{}) {
 func (g *Generator) expandVar(word string) string {
 	switch word {
 	case "GOARCH":
-		return runtime.GOARCH
+		return buildContext.GOARCH
 	case "GOOS":
-		return runtime.GOOS
+		return buildContext.GOOS
 	case "GOFILE":
 		return g.file
 	case "GOLINE":