From ab9c25f2de06e74cade453876835b3c1533a39de Mon Sep 17 00:00:00 2001 From: Andrew Gerrand Date: Tue, 30 Jun 2015 15:35:01 +1000 Subject: [PATCH] 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 --- src/cmd/go/generate.go | 4 ++-- 1 file 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": -- 2.50.0