Skip to content

Commit 56a14ad

Browse files
ianlancetaylorgopherbot
authored andcommitted
cmd/dist, internal/platform: remove some target modes that fail
Before CL 463992 there were some cases that cmd/dist did not test but that platform.BuildModeSupport permitted. In CL 463992 those conflicts were resolved in favor of platform.BuildModeSupport. However, further testing has uncovered some cases that do not in fact work. Adjust those in both cmd/dist and internal/platform. In particular, mark android-arm and android-arm64 as not supporting plugin mode. Sample failure: https://build.golang.org/log/ebba858ea9f94f076966d8cfd42348a0e9345095 Mark ios as not supporting c-archive mode. Sample failure: https://build.golang.org/log/e78a58189d94b90dc6d4b2e01a1b4a0b35d63792 Fixes #58170 Fixes #58172 Change-Id: Ic1bd18e36382cac0779aad48cb6e7b1de8eeb10d Reviewed-on: https://go-review.googlesource.com/c/go/+/464339 Reviewed-by: Bryan Mills <[email protected]> Run-TryBot: Ian Lance Taylor <[email protected]> Auto-Submit: Ian Lance Taylor <[email protected]> Run-TryBot: Ian Lance Taylor <[email protected]> Reviewed-by: Ian Lance Taylor <[email protected]> TryBot-Result: Gopher Robot <[email protected]>
1 parent 23c0121 commit 56a14ad

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/cmd/dist/test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1143,7 +1143,7 @@ func (t *tester) supportedBuildmode(mode string) bool {
11431143
return false
11441144
}
11451145
switch goos {
1146-
case "aix", "darwin", "ios", "windows":
1146+
case "aix", "darwin", "windows":
11471147
return true
11481148
case "linux":
11491149
switch goarch {
@@ -1182,7 +1182,7 @@ func (t *tester) supportedBuildmode(mode string) bool {
11821182
switch pair {
11831183
case "linux-386", "linux-amd64", "linux-arm", "linux-arm64", "linux-s390x", "linux-ppc64le":
11841184
return true
1185-
case "android-386", "android-amd64", "android-arm", "android-arm64":
1185+
case "android-386", "android-amd64":
11861186
return true
11871187
case "darwin-amd64", "darwin-arm64":
11881188
return true

src/internal/platform/supported.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ func BuildModeSupported(compiler, buildmode, goos, goarch string) bool {
101101

102102
case "c-archive":
103103
switch goos {
104-
case "aix", "darwin", "ios", "windows":
104+
case "aix", "darwin", "windows":
105105
return true
106106
case "linux":
107107
switch goarch {
@@ -163,7 +163,7 @@ func BuildModeSupported(compiler, buildmode, goos, goarch string) bool {
163163
case "plugin":
164164
switch platform {
165165
case "linux/amd64", "linux/arm", "linux/arm64", "linux/386", "linux/s390x", "linux/ppc64le",
166-
"android/amd64", "android/arm", "android/arm64", "android/386",
166+
"android/amd64", "android/386",
167167
"darwin/amd64", "darwin/arm64",
168168
"freebsd/amd64":
169169
return true

0 commit comments

Comments
 (0)