cmd/dist: detect gohostarch on netbsd/arm64 hosts

On netbsd/arm64 `uname -m` reports `evbarm` which is mapped to
gohostarch=arm. Fix this by checking for "aarch64" in `uname -p` output
to fix self-hosted build on netbsd/arm64.

Updates #30824

Change-Id: I0f0450ff35af0bec51aeec3b210143ba892216c6
Reviewed-on: https://go-review.googlesource.com/c/go/+/257643
Trust: Tobias Klauser <tobias.klauser@gmail.com>
Trust: Benny Siegert <bsiegert@gmail.com>
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Benny Siegert <bsiegert@gmail.com>

diff --git a/src/cmd/dist/main.go b/src/cmd/dist/main.go
index b8a8c5f2e665b7a45a3643425cc0043359066309..224b6c0c3e62f4879dc48fa3cf4720aeaa325ee9 100644 (file)
--- a/src/cmd/dist/main.go
+++ b/src/cmd/dist/main.go
@@ -108,6 +108,9 @@ func main() {
                        gohostarch = "arm64"
                case strings.Contains(out, "arm"):
                        gohostarch = "arm"
+                       if gohostos == "netbsd" && strings.Contains(run("", CheckExit, "uname", "-p"), "aarch64") {
+                               gohostarch = "arm64"
+                       }
                case strings.Contains(out, "ppc64le"):
                        gohostarch = "ppc64le"
                case strings.Contains(out, "ppc64"):