From 0a4de4f88c3f11196cf9976c2d4f269d1502bbdc Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Fri, 3 Sep 2021 14:02:41 +0200 Subject: [PATCH] cmd/gogio: handle darwin/arm64 in archNDK This makes gogio builds work for android on darwin/arm64. Signed-off-by: Felix Lange --- cmd/gogio/androidbuild.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cmd/gogio/androidbuild.go b/cmd/gogio/androidbuild.go index 87486669..e184de96 100644 --- a/cmd/gogio/androidbuild.go +++ b/cmd/gogio/androidbuild.go @@ -798,6 +798,14 @@ func archNDK() string { arch = "x86" case "amd64": arch = "x86_64" + case "arm64": + if runtime.GOOS == "darwin" { + // Workaround for arm64 macOS. This will keep working until + // Apple deprecates Rosetta 2. + arch = "x86_64" + } else { + panic("unsupported GOARCH: " + runtime.GOARCH) + } default: panic("unsupported GOARCH: " + runtime.GOARCH) }