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 a17f6e7747935926bf5f1948892436553a3c3eb2..98513ce122b5c3e789f5c328dedac5fdf37f0e40 100644 (file)
--- 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":