mirror of
https://github.com/golang/go
synced 2024-09-29 22:24:33 -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:
parent
f03b3331c7
commit
d2c12634de
7
src/cmd/dist/build.go
vendored
7
src/cmd/dist/build.go
vendored
@ -1425,15 +1425,16 @@ func cmdbootstrap() {
|
||||
}
|
||||
|
||||
func wrapperPathFor(goos, goarch string) string {
|
||||
if goos == gohostos && goarch == gohostarch {
|
||||
return ""
|
||||
}
|
||||
switch {
|
||||
case goos == "android":
|
||||
if gohostos != "android" {
|
||||
return pathf("%s/misc/android/go_android_exec.go", goroot)
|
||||
}
|
||||
case goos == "darwin" && (goarch == "arm" || goarch == "arm64"):
|
||||
if gohostos != "darwin" || (gohostarch != "arm" && gohostarch != "arm64") {
|
||||
return pathf("%s/misc/ios/go_darwin_arm_exec.go", goroot)
|
||||
}
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user