Skip to content

Commit 86ad2d5

Browse files
ianlancetaylorgopherbot
authored andcommitted
Revert "cmd/go: use platform.MustLinkExternal in externalLinkingForced"
This reverts CL 477395. Failing on darwin-amd64 builders: https://build.golang.org/log/b07ec5e40a896f5d099e4c85f4094321ecc84f21 loadinternal: cannot find runtime/cgo signal: trace/BPT trap FAIL crypto/x509 0.024s FAIL 2023/03/20 12:16:35 Failed: exit status 1 Change-Id: Ib9923f9ff7e24c3b5f8690ba1d6b5d0b6693d49c Reviewed-on: https://go-review.googlesource.com/c/go/+/477736 TryBot-Result: Gopher Robot <[email protected]> Auto-Submit: Ian Lance Taylor <[email protected]> Reviewed-by: Bryan Mills <[email protected]> Reviewed-by: Ian Lance Taylor <[email protected]> Run-TryBot: Ian Lance Taylor <[email protected]>
1 parent 6e57ecd commit 86ad2d5

File tree

1 file changed

+6
-1
lines changed
  • src/cmd/go/internal/load

1 file changed

+6
-1
lines changed

src/cmd/go/internal/load/pkg.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2606,7 +2606,12 @@ func externalLinkingForced(p *Package) bool {
26062606
}
26072607

26082608
// Some targets must use external linking even inside GOROOT.
2609-
if platform.MustLinkExternal(cfg.BuildContext.GOOS, cfg.BuildContext.GOARCH, false) {
2609+
switch cfg.BuildContext.GOOS {
2610+
case "android":
2611+
if cfg.BuildContext.GOARCH != "arm64" {
2612+
return true
2613+
}
2614+
case "ios":
26102615
return true
26112616
}
26122617

0 commit comments

Comments
 (0)