From 367fba8520cf7bc4ce9004c1861fce54db03d5d2 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Wed, 9 Oct 2024 18:16:42 -0700 Subject: [PATCH] control/controlhttp: don't link ts2021 server + websocket code on iOS We probably shouldn't link it in anywhere, but let's fix iOS for now. Updates #13762 Updates tailscale/corp#20099 Change-Id: Idac116e9340434334c256acba3866f02bd19827c Signed-off-by: Brad Fitzpatrick --- control/controlhttp/server.go | 2 ++ tstest/iosdeps/iosdeps_test.go | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/control/controlhttp/server.go b/control/controlhttp/server.go index 6a0d2bc56..7c3dd5618 100644 --- a/control/controlhttp/server.go +++ b/control/controlhttp/server.go @@ -1,6 +1,8 @@ // Copyright (c) Tailscale Inc & AUTHORS // SPDX-License-Identifier: BSD-3-Clause +//go:build !ios + package controlhttp import ( diff --git a/tstest/iosdeps/iosdeps_test.go b/tstest/iosdeps/iosdeps_test.go index 08df9a930..273872a64 100644 --- a/tstest/iosdeps/iosdeps_test.go +++ b/tstest/iosdeps/iosdeps_test.go @@ -14,9 +14,11 @@ func TestDeps(t *testing.T) { GOOS: "ios", GOARCH: "arm64", BadDeps: map[string]string{ - "testing": "do not use testing package in production code", - "text/template": "linker bloat (MethodByName)", - "html/template": "linker bloat (MethodByName)", + "testing": "do not use testing package in production code", + "text/template": "linker bloat (MethodByName)", + "html/template": "linker bloat (MethodByName)", + "tailscale.com/net/wsconn": "https://github.com/tailscale/tailscale/issues/13762", + "github.com/coder/websocket": "https://github.com/tailscale/tailscale/issues/13762", }, }.Check(t) }