diff options
| author | Elias Naur <mail@eliasnaur.com> | 2020-11-25 19:12:13 +0100 |
|---|---|---|
| committer | Elias Naur <mail@eliasnaur.com> | 2020-11-25 19:21:55 +0000 |
| commit | ef603bead5d336e81954f890e20efa0261581792 (patch) | |
| tree | ebaee92f518de8fff8e3958e9c60331fb1d69455 /src/cmd/internal/objabi | |
| parent | 9dc2350d8cb10f8af5f3551aeb5e3e8bf820c071 (diff) | |
| download | go-ef603bead5d336e81954f890e20efa0261581792.tar.xz | |
cmd/dist: restore GOARM=7 default for android/arm
Fixes the android/arm builder. Without it, the builder reported
unexpected stale targets during bootstrap:
https://build.golang.org/log/b951f1171be54cf4a12c2a0720ffaf07f8a11377
Tighten the GOARM=7 default in cmd/internal/objabi while here.
Change-Id: I944744910193e72e91bc37b5bf0783076b45e579
Reviewed-on: https://go-review.googlesource.com/c/go/+/273167
Run-TryBot: Elias Naur <mail@eliasnaur.com>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Trust: Elias Naur <mail@eliasnaur.com>
Diffstat (limited to 'src/cmd/internal/objabi')
| -rw-r--r-- | src/cmd/internal/objabi/util.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cmd/internal/objabi/util.go b/src/cmd/internal/objabi/util.go index d36e743580..a73ab479a1 100644 --- a/src/cmd/internal/objabi/util.go +++ b/src/cmd/internal/objabi/util.go @@ -41,8 +41,8 @@ const ( func goarm() int { def := defaultGOARM - if GOOS == "android" { - // Android devices always support GOARM=7. + if GOOS == "android" && GOARCH == "arm" { + // Android arm devices always support GOARM=7. def = "7" } switch v := envOr("GOARM", def); v { |