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 tailscale#13762 Updates tailscale/corp#20099 Change-Id: Idac116e9340434334c256acba3866f02bd19827c Signed-off-by: Brad Fitzpatrick <[email protected]>
ninech · Oct 10, 2024 · 367fba8 · 367fba8
1 parent 52ef27a
commit 367fba8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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)
 }