diff options
| author | Brad Fitzpatrick <bradfitz@golang.org> | 2017-05-23 05:22:25 +0000 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2017-05-23 21:39:36 +0000 |
| commit | 1b53f15ebb00dd158af674df410c7941abb2b933 (patch) | |
| tree | dcf7bc23819cfec3d8afba6a43f1774a25a933ce /src/cmd/go/internal/envcmd/env.go | |
| parent | 8a2553e380196dda556608e2fe79881004770eb9 (diff) | |
| download | go-1b53f15ebb00dd158af674df410c7941abb2b933.tar.gz go-1b53f15ebb00dd158af674df410c7941abb2b933.zip | |
cmd/go: include GOARM and GO386 in computed build ID
Now:
$ GOARCH=arm GOARM=5 go install -x cmd/go
... followed by:
$ GOARCH=arm GOARM= go install -x cmd/go
... actually does work. Previously the second "go install" would reuse
the cached binaries from the GOARM=5 command and not rebuild.
(Or vice versa from GOARM= to GOARM=5)
And do the same for GO386.
Fixes #9737
Change-Id: I9630aab34d06465d5033e6743dfe6592c8247aa0
Reviewed-on: https://go-review.googlesource.com/43855
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src/cmd/go/internal/envcmd/env.go')
| -rw-r--r-- | src/cmd/go/internal/envcmd/env.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go index f1bc10b32d..6cb602031e 100644 --- a/src/cmd/go/internal/envcmd/env.go +++ b/src/cmd/go/internal/envcmd/env.go @@ -68,9 +68,9 @@ func MkEnv() []cfg.EnvVar { switch cfg.Goarch { case "arm": - env = append(env, cfg.EnvVar{Name: "GOARM", Value: os.Getenv("GOARM")}) + env = append(env, cfg.EnvVar{Name: "GOARM", Value: cfg.GOARM}) case "386": - env = append(env, cfg.EnvVar{Name: "GO386", Value: os.Getenv("GO386")}) + env = append(env, cfg.EnvVar{Name: "GO386", Value: cfg.GO386}) } cmd := b.GccCmd(".") |