From e6d7326fb661f9754300d6b9fc5fbb2ee2e4a46b Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Fri, 15 Nov 2019 18:30:19 -0500 Subject: 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 TryBot-Result: Gobot Gobot Reviewed-by: Ian Lance Taylor Reviewed-by: Cherry Zhang --- src/cmd/internal/sys/supported.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/cmd/internal/sys') 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 -- cgit v1.3-5-g9baa