From 8ea546e47d0f53b9bf71f0fa2b4ef7c3af4b426e Mon Sep 17 00:00:00 2001
From: John Howard <howardjohn@google.com>
Date: Wed, 17 Feb 2021 07:43:14 -0800
Subject: [PATCH] Add support for apple silicon

For https://github.com/istio/istio/issues/29596

Next step is include it in the release

Manually built at
http://storage.googleapis.com/howardjohn/tmp/istioctl-osx-arm64. Please
test it, I don't have a mac.
---
 Makefile.core.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile.core.mk b/Makefile.core.mk
index 0997ac469b3e..627f181ac08a 100644
--- a/Makefile.core.mk
+++ b/Makefile.core.mk
@@ -397,7 +397,9 @@ ${ISTIO_OUT}/release/istioctl-linux-armv7: depend
 ${ISTIO_OUT}/release/istioctl-linux-arm64: depend
 	GOOS=linux GOARCH=arm64 LDFLAGS=$(RELEASE_LDFLAGS) common/scripts/gobuild.sh $@ ./istioctl/cmd/istioctl
 ${ISTIO_OUT}/release/istioctl-osx: depend
-	GOOS=darwin LDFLAGS=$(RELEASE_LDFLAGS) common/scripts/gobuild.sh $@ ./istioctl/cmd/istioctl
+	GOOS=darwin GOARCH=amd64 LDFLAGS=$(RELEASE_LDFLAGS) common/scripts/gobuild.sh $@ ./istioctl/cmd/istioctl
+${ISTIO_OUT}/release/istioctl-osx-arm64: depend
+	GOOS=darwin GOARCH=arm64 LDFLAGS=$(RELEASE_LDFLAGS) common/scripts/gobuild.sh $@ ./istioctl/cmd/istioctl
 ${ISTIO_OUT}/release/istioctl-win.exe: depend
 	GOOS=windows LDFLAGS=$(RELEASE_LDFLAGS) common/scripts/gobuild.sh $@ ./istioctl/cmd/istioctl
 
@@ -418,6 +420,7 @@ binaries-test:
 .PHONY: istioctl-all
 istioctl-all: ${ISTIO_OUT}/release/istioctl-linux-amd64 ${ISTIO_OUT}/release/istioctl-linux-armv7 ${ISTIO_OUT}/release/istioctl-linux-arm64 \
 	${ISTIO_OUT}/release/istioctl-osx \
+	${ISTIO_OUT}/release/istioctl-osx-arm64 \
 	${ISTIO_OUT}/release/istioctl-win.exe
 
 .PHONY: istioctl.completion