diff options
| author | Andrew Gerrand <adg@golang.org> | 2015-06-30 15:35:01 +1000 |
|---|---|---|
| committer | Andrew Gerrand <adg@golang.org> | 2015-06-30 06:52:47 +0000 |
| commit | ab9c25f2de06e74cade453876835b3c1533a39de (patch) | |
| tree | a09a3eb2cabcc30df8d1de6075b27fb27ab6134a | |
| parent | b8d2d6b9c0fcd66fe9579d7525d4ec5ecc2d73a3 (diff) | |
| download | go-ab9c25f2de06e74cade453876835b3c1533a39de.tar.gz go-ab9c25f2de06e74cade453876835b3c1533a39de.zip | |
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>
| -rw-r--r-- | src/cmd/go/generate.go | 4 |
1 files changed, 2 insertions, 2 deletions
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": |