From d2c12634dedad9976dae0621d863d2cfb3a040bc Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Thu, 2 May 2019 03:12:12 -0400 Subject: [PATCH] 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 TryBot-Result: Gobot Gobot Reviewed-by: Brad Fitzpatrick --- src/cmd/dist/build.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go index a9c6c04c73..2af6a2dd1b 100644 --- a/src/cmd/dist/build.go +++ b/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 "" } -- 2.48.1