From 8d2935ab7ccf621443691fa8c103a6decf4fbfb2 Mon Sep 17 00:00:00 2001 From: Cherry Mui Date: Tue, 8 Feb 2022 14:46:58 -0500 Subject: [release-branch.go1.17] cmd/dist: test cgo internal linking on darwin-arm64 CL 415074 disables testing cgo internal linking on all ARM64 but Windows, because it doesn't work with newer GCC. But - darwin-arm64 works, and it does not use GCC - we don't support cgo internal linking on windows-arm64 anyway. This CL fixes the condition. Fixes #53050. Change-Id: I9eb7b81ef75e482f5e95d2edae4863ba21396432 Reviewed-on: https://go-review.googlesource.com/c/go/+/384269 Trust: Cherry Mui Run-TryBot: Cherry Mui TryBot-Result: Gopher Robot Reviewed-by: Ian Lance Taylor (cherry picked from commit e4ca3fa345a204b72a011b3634ddcfc09dcc68bc) Reviewed-on: https://go-review.googlesource.com/c/go/+/415075 Reviewed-by: Cherry Mui Run-TryBot: Dmitri Shuralyov Reviewed-by: Dmitri Shuralyov --- src/cmd/dist/test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go index a6ea64b495..4f1d556dd4 100644 --- a/src/cmd/dist/test.go +++ b/src/cmd/dist/test.go @@ -1142,7 +1142,7 @@ func (t *tester) cgoTest(dt *distTest) error { // Skip internal linking cases on arm64 to support GCC-9.4 and above. // See issue #39466. - skipInternalLink := goarch == "arm64" && goos != "windows" + skipInternalLink := goarch == "arm64" && goos != "darwin" if t.internalLink() && !skipInternalLink { cmd := t.addCmd(dt, "misc/cgo/test", t.goTest(), "-tags=internal") -- cgit v1.2.3-54-g00ecf