1
0
mirror of https://github.com/golang/go synced 2024-09-29 20:14:29 -06:00

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 <mail@eliasnaur.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
Elias Naur 2019-05-02 03:12:12 -04:00 committed by Brad Fitzpatrick
parent f03b3331c7
commit d2c12634de

11
src/cmd/dist/build.go vendored
View File

@ -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 ""
}