cmd/dist: don't generate exec wrappers for compatible cross compiles

This change will allow android/arm64 hosts to build for android/arm,
and likewise for iOS.

Updates #31722

Change-Id: Id410bd112abbab585ebb13b61fe4d3a38a1a81fb
Reviewed-on: https://go-review.googlesource.com/c/go/+/174705
Run-TryBot: Elias Naur <[email protected]>
TryBot-Result: Gobot Gobot <[email protected]>
Reviewed-by: Brad Fitzpatrick <[email protected]>

Author: eliasnaur

src/cmd/dist/build.go

@@ -1425,14 +1425,15 @@ func cmdbootstrap() {
 }
 
 func wrapperPathFor(goos, goarch string) string {
-	if goos == gohostos && goarch == gohostarch {
-		return ""
-	}
 	switch {
 	case goos == "android":
-		return pathf("%s/misc/android/go_android_exec.go", goroot)
+		if gohostos != "android" {
+			return pathf("%s/misc/android/go_android_exec.go", goroot)
+		}
 	case goos == "darwin" && (goarch == "arm" || goarch == "arm64"):
-		return pathf("%s/misc/ios/go_darwin_arm_exec.go", goroot)
+		if gohostos != "darwin" || (gohostarch != "arm" && gohostarch != "arm64") {
+			return pathf("%s/misc/ios/go_darwin_arm_exec.go", goroot)
+		}
 	}
 	return ""
 }