diff options
| author | Austin Clements <austin@google.com> | 2020-04-03 12:22:27 -0400 |
|---|---|---|
| committer | Austin Clements <austin@google.com> | 2020-04-08 18:35:49 +0000 |
| commit | f7e6ab44b410ef56bb89da182948a451d3cca34c (patch) | |
| tree | 9d49b461aff716c2d398e720c9bee93c20e1898e /src/internal/testenv | |
| parent | da8591b61c141ca58e4b3eae382d2827006344fd (diff) | |
| download | go-f7e6ab44b410ef56bb89da182948a451d3cca34c.tar.xz | |
all: remove scattered remnants of darwin/arm
This removes all conditions and conditional code (that I could find)
that depended on darwin/arm.
Fixes #35439 (since that only happened on darwin/arm)
Fixes #37611.
Change-Id: Ia4c32a5a4368ed75231075832b0b5bfb1ad11986
Reviewed-on: https://go-review.googlesource.com/c/go/+/227198
Run-TryBot: Austin Clements <austin@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
Diffstat (limited to 'src/internal/testenv')
| -rw-r--r-- | src/internal/testenv/testenv.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/internal/testenv/testenv.go b/src/internal/testenv/testenv.go index b036aa6ebc..309b2702ed 100644 --- a/src/internal/testenv/testenv.go +++ b/src/internal/testenv/testenv.go @@ -46,7 +46,7 @@ func HasGoBuild() bool { case "android", "js": return false case "darwin": - if strings.HasPrefix(runtime.GOARCH, "arm") { + if runtime.GOARCH == "arm64" { return false } } @@ -125,7 +125,7 @@ func HasExec() bool { case "js": return false case "darwin": - if strings.HasPrefix(runtime.GOARCH, "arm") { + if runtime.GOARCH == "arm64" { return false } } @@ -136,7 +136,7 @@ func HasExec() bool { func HasSrc() bool { switch runtime.GOOS { case "darwin": - if strings.HasPrefix(runtime.GOARCH, "arm") { + if runtime.GOARCH == "arm64" { return false } } |