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>
golang · Jun 30, 2015 · ab9c25f · ab9c25f
1 parent b8d2d6b
commit ab9c25f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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":