From: Cherry Zhang <cherryyz@google.com>
Date: Wed, 14 Oct 2020 00:44:04 +0000 (-0400)
Subject: cmd/dist: only build ios_exec wrapper for ios
X-Git-Tag: go1.16beta1~720
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=748c0d87e23eaae0ba133d2f613b82c009ac8cb4;p=gostls13.git

cmd/dist: only build ios_exec wrapper for ios

Not for darwin/arm64.

Updates #38485.

Change-Id: I08a5f00fd77f20c9c483755a36755a63cf10aa1a
Reviewed-on: https://go-review.googlesource.com/c/go/+/262558
Trust: Cherry Zhang <cherryyz@google.com>
Run-TryBot: Cherry Zhang <cherryyz@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Austin Clements <austin@google.com>
---

diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
index 69a66abd2d..398ed6bce1 100644
--- a/src/cmd/dist/build.go
+++ b/src/cmd/dist/build.go
@@ -1462,8 +1462,8 @@ func wrapperPathFor(goos, goarch string) string {
 		if gohostos != "android" {
 			return pathf("%s/misc/android/go_android_exec.go", goroot)
 		}
-	case (goos == "darwin" || goos == "ios") && goarch == "arm64":
-		if gohostos != "darwin" || gohostarch != "arm64" {
+	case goos == "ios":
+		if gohostos != "ios" {
 			return pathf("%s/misc/ios/go_ios_exec.go", goroot)
 		}
 	}