From 059ca6185c19404e991cc7714b1df047fd78785f Mon Sep 17 00:00:00 2001 From: Cherry Zhang Date: Fri, 2 Oct 2020 21:57:24 -0400 Subject: cmd/dist: detect gohostarch on ios/arm64 Add a case for gohostos == "ios" along with "darwin". Updates #38485. Change-Id: Ic7310e6c97d405f78a5e5db1a639860455e61327 Reviewed-on: https://go-review.googlesource.com/c/go/+/259337 Trust: Cherry Zhang Run-TryBot: Cherry Zhang TryBot-Result: Go Bot Reviewed-by: Dmitri Shuralyov --- src/cmd/dist/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/cmd/dist/main.go') diff --git a/src/cmd/dist/main.go b/src/cmd/dist/main.go index 224b6c0c3e..37fc522356 100644 --- a/src/cmd/dist/main.go +++ b/src/cmd/dist/main.go @@ -129,7 +129,7 @@ func main() { gohostarch = "riscv64" case strings.Contains(out, "s390x"): gohostarch = "s390x" - case gohostos == "darwin": + case gohostos == "darwin", gohostos == "ios": if strings.Contains(run("", CheckExit, "uname", "-v"), "RELEASE_ARM64_") { gohostarch = "arm64" } -- cgit v1.2.1 From 9499a2e10840e3878bff06e7f9a3bdaa56c5ca45 Mon Sep 17 00:00:00 2001 From: Joel Sing Date: Wed, 26 Aug 2020 03:18:30 +1000 Subject: cmd/dist: detect gohostarch for openbsd/mips64 On OpenBSD/octeon `uname -m` returns 'octeon' and we need `uname -p` to determine the processor type (mips64). Update #40995 Change-Id: I37c53ca2c372ab958fff17917d82d41f4b0a0393 Reviewed-on: https://go-review.googlesource.com/c/go/+/250583 Trust: Joel Sing Run-TryBot: Joel Sing TryBot-Result: Go Bot Reviewed-by: Ian Lance Taylor --- src/cmd/dist/main.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/cmd/dist/main.go') diff --git a/src/cmd/dist/main.go b/src/cmd/dist/main.go index 37fc522356..37de1acc31 100644 --- a/src/cmd/dist/main.go +++ b/src/cmd/dist/main.go @@ -133,6 +133,10 @@ func main() { if strings.Contains(run("", CheckExit, "uname", "-v"), "RELEASE_ARM64_") { gohostarch = "arm64" } + case gohostos == "openbsd": + if strings.Contains(run("", CheckExit, "uname", "-p"), "mips64") { + gohostarch = "mips64" + } default: fatalf("unknown architecture: %s", out) } -- cgit v1.2.1