From 5b6a90fb33a74e0535fb3942997c79b66c4160eb Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <bradfitz@tailscale.com>
Date: Wed, 23 Aug 2023 21:38:13 -0700
Subject: [PATCH] types/logger, cmd/tailscale/cli: flesh out, simplify some
 non-unix build tags

Can write "wasm" instead of js || wasi1p, since there's only two:

    $ go tool dist list | grep wasm
    js/wasm
    wasip1/wasm

Plus, if GOOS=wasip2 is added later, we're already set.

Updates #5794

Change-Id: Ifcfb187c3775c17c9141bc721512dc4577ac4434
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
---
 cmd/tailscale/cli/ssh_unix.go  | 2 +-
 types/logger/rusage_stub.go    | 2 +-
 types/logger/rusage_syscall.go | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmd/tailscale/cli/ssh_unix.go b/cmd/tailscale/cli/ssh_unix.go
index efc3472a3..71c0caaa6 100644
--- a/cmd/tailscale/cli/ssh_unix.go
+++ b/cmd/tailscale/cli/ssh_unix.go
@@ -1,7 +1,7 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-//go:build !js && !windows
+//go:build !wasm && !windows && !plan9
 
 package cli
 
diff --git a/types/logger/rusage_stub.go b/types/logger/rusage_stub.go
index 5aba2066b..e9698d715 100644
--- a/types/logger/rusage_stub.go
+++ b/types/logger/rusage_stub.go
@@ -1,7 +1,7 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-//go:build windows || js || wasip1
+//go:build windows || wasm || plan9
 
 package logger
 
diff --git a/types/logger/rusage_syscall.go b/types/logger/rusage_syscall.go
index 6378521b6..ebf98280b 100644
--- a/types/logger/rusage_syscall.go
+++ b/types/logger/rusage_syscall.go
@@ -1,7 +1,7 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-//go:build !windows && !js && !wasip1
+//go:build !windows && !wasm && !plan9
 
 package logger