From a21a6e44616eed6fa6eae0e40864d109390960ed Mon Sep 17 00:00:00 2001 From: Joel Sing Date: Wed, 24 Apr 2019 23:04:23 +1000 Subject: [PATCH] cmd/dist: handle arm64 as a machine hardware name OpenBSD/arm64 reports itself as arm64 from `uname -m` - this currently matches as gohostarch=arm, rather than gohostarch=arm64. Correct this by matching on both aarch64 and arm64 (the alternative would be to use `uname -p`, however that's likely to cause upset elsewhere). Updates #31656 Change-Id: I7b2da93495d808e704caf032b3fadc984077769e Reviewed-on: https://go-review.googlesource.com/c/go/+/173598 Reviewed-by: Brad Fitzpatrick --- src/cmd/dist/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cmd/dist/main.go b/src/cmd/dist/main.go index ed116e22f6..55d5be3e43 100644 --- a/src/cmd/dist/main.go +++ b/src/cmd/dist/main.go @@ -103,10 +103,10 @@ func main() { gohostarch = "amd64" case strings.Contains(out, "86"): gohostarch = "386" + case strings.Contains(out, "aarch64"), strings.Contains(out, "arm64"): + gohostarch = "arm64" case strings.Contains(out, "arm"): gohostarch = "arm" - case strings.Contains(out, "aarch64"): - gohostarch = "arm64" case strings.Contains(out, "ppc64le"): gohostarch = "ppc64le" case strings.Contains(out, "ppc64"): -- 2.48.1