aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/internal/sys
diff options
context:
space:
mode:
authorElias Naur <mail@eliasnaur.com>2019-11-15 18:30:19 -0500
committerElias Naur <mail@eliasnaur.com>2020-02-26 09:47:21 +0000
commite6d7326fb661f9754300d6b9fc5fbb2ee2e4a46b (patch)
tree5901cfd8c50035232b34922b81abc98900cca8bd /src/cmd/internal/sys
parent42b93b7fe616b685e9ea41514b15bc9c26d3eac8 (diff)
downloadgo-e6d7326fb661f9754300d6b9fc5fbb2ee2e4a46b.tar.xz
cmd/link: default to internal linking for android/arm64
The bootstrapping process (make.bash) on all other platforms use internal linking. This change brings android/arm64 in line, fixing the scary warning on our self-hosted Corellium builders: warning: unable to find runtime/cgo.a The linkmode default is changed to internal for all Android programs, but in practice that won't matter outside our builders: using Go with Android apps requires buildmode=c-shared which uses linkmode external. Fixes #31343 Updates #31819 Change-Id: I3b3ada5ed69a7989e6d8e5960bbebf5e1c22aada Reviewed-on: https://go-review.googlesource.com/c/go/+/207299 Run-TryBot: Elias Naur <mail@eliasnaur.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Ian Lance Taylor <iant@golang.org> Reviewed-by: Cherry Zhang <cherryyz@google.com>
Diffstat (limited to 'src/cmd/internal/sys')
-rw-r--r--src/cmd/internal/sys/supported.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/cmd/internal/sys/supported.go b/src/cmd/internal/sys/supported.go
index 02f833e945..c8ab2181b5 100644
--- a/src/cmd/internal/sys/supported.go
+++ b/src/cmd/internal/sys/supported.go
@@ -35,7 +35,9 @@ func MSanSupported(goos, goarch string) bool {
func MustLinkExternal(goos, goarch string) bool {
switch goos {
case "android":
- return true
+ if goarch != "arm64" {
+ return true
+ }
case "darwin":
if goarch == "arm" || goarch == "arm64" {
return true