Skip to content

Commit

Permalink
internal/releasetargets: set GOARM=6 for linux-armv6l
Browse files Browse the repository at this point in the history
From Dmitri's well-researched comment on golang/go#62164:

It was set to GOARM=6 in 1.20 and older because the release target used
the linux-arm-aws builder, and that builder has GOARM=6 in its
environment. For Go 1.21.0, it's built on a linux-amd64 builder via
make.bash -distpack, and GOARM wasn't set in the release target's
environment explicitly, so it ended up defaulting to 7 in make.bash.

Since this was always the effective environment, set it on the target
going back to 1.19. (I didn't get rid of 1.19 because we're still
planning the out-of-cycle release.)

Fixes golang/go#62164

Change-Id: I539d9dfaf9036e4ac9a6a11fc1e73440d8437a80
Reviewed-on: https://go-review.googlesource.com/c/build/+/521555
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Run-TryBot: Heschi Kreinick <heschi@google.com>
Auto-Submit: Heschi Kreinick <heschi@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
  • Loading branch information
heschi authored and gopherbot committed Aug 21, 2023
1 parent 5a5198d commit e13be9c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
3 changes: 3 additions & 0 deletions internal/releasetargets/releases.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ linux-arm64 linux arm64 linux-arm64
Running on GCP

linux-armv6l linux arm linux-arm-aws
Extra env: ["GOARM=6"]
Running on AWS

linux-ppc64le linux ppc64le linux-ppc64le-buildlet
Expand Down Expand Up @@ -78,6 +79,7 @@ linux-arm64 linux arm64 linux-arm64
Running on GCP

linux-armv6l linux arm linux-arm-aws
Extra env: ["GOARM=6"]
Running on AWS

linux-ppc64le linux ppc64le linux-ppc64le-buildlet
Expand Down Expand Up @@ -140,6 +142,7 @@ linux-arm64 linux arm64 linux-arm64
Running on GCP

linux-armv6l linux arm linux-arm-aws
Extra env: ["GOARM=6"]
Running on AWS

linux-loong64 linux loong64 (cross-compiled, no tests)
Expand Down
5 changes: 3 additions & 2 deletions internal/releasetargets/releasetargets.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,9 @@ var allReleases = map[int]ReleaseTargets{
LongTestBuilder: "linux-386-longtest",
},
"linux-armv6l": &Target{
GOARCH: "arm",
Builder: "linux-arm-aws",
GOARCH: "arm",
Builder: "linux-arm-aws",
ExtraEnv: []string{"GOARM=6"},
},
"linux-arm64": &Target{
Builder: "linux-arm64",
Expand Down

0 comments on commit e13be9c

Please sign in to comment.