diff options
| author | Ian Lance Taylor <iant@golang.org> | 2021-01-27 17:55:50 -0800 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2021-01-29 11:04:55 -0800 |
| commit | 726b7aa004d6885388a76521222602b8552a41ee (patch) | |
| tree | 5179037ef840a43dcea0f3be4e07dbcbcfcb2c4a /libgo/misc/cgo | |
| parent | 91a95ad2ae0e0f2fa953fafe55ff2ec32c8277d5 (diff) | |
libgo: update to Go1.16rc1
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/287493
Diffstat (limited to 'libgo/misc/cgo')
| -rw-r--r-- | libgo/misc/cgo/test/pkg_test.go | 2 | ||||
| -rw-r--r-- | libgo/misc/cgo/testcarchive/carchive_test.go | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/libgo/misc/cgo/test/pkg_test.go b/libgo/misc/cgo/test/pkg_test.go index a28ad4ea74f..94abaa03e8d 100644 --- a/libgo/misc/cgo/test/pkg_test.go +++ b/libgo/misc/cgo/test/pkg_test.go @@ -30,7 +30,7 @@ func TestCrossPackageTests(t *testing.T) { switch runtime.GOOS { case "android": t.Skip("Can't exec cmd/go subprocess on Android.") - case "darwin", "ios": + case "ios": switch runtime.GOARCH { case "arm64": t.Skip("Can't exec cmd/go subprocess on iOS.") diff --git a/libgo/misc/cgo/testcarchive/carchive_test.go b/libgo/misc/cgo/testcarchive/carchive_test.go index f3978b20cbe..b67cb2e0cd0 100644 --- a/libgo/misc/cgo/testcarchive/carchive_test.go +++ b/libgo/misc/cgo/testcarchive/carchive_test.go @@ -118,11 +118,6 @@ func testMain(m *testing.M) int { cc = append(cc, s[start:]) } - if GOOS == "darwin" || GOOS == "ios" { - // For Darwin/ARM. - // TODO: do we still need this? - cc = append(cc, []string{"-framework", "CoreFoundation", "-framework", "Foundation"}...) - } if GOOS == "aix" { // -Wl,-bnoobjreorder is mandatory to keep the same layout // in .text section. |