all: adjust build tags for wasip1/wasm

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

diff --git a/conn/controlfns_unix.go b/conn/controlfns_unix.go
index c4536d4bb4828989b7f7dabce5643a80cbf592ef..91692c0a6540be5ccc99bc2c29a0dc6981035485 100644 (file)
--- a/conn/controlfns_unix.go
+++ b/conn/controlfns_unix.go
@@ -1,4 +1,4 @@
-//go:build !windows && !linux && !js
+//go:build !windows && !linux && !wasm
 
 /* SPDX-License-Identifier: MIT
  *

diff --git a/ipc/uapi_js.go b/ipc/uapi_wasm.go
similarity index 80%
rename from ipc/uapi_js.go
rename to ipc/uapi_wasm.go
index 2570515e20fb8830ee7a34de9a9c15e505e0413f..fa84684aa5fca3ea2917c1bfff5e8a7a1408d82e 100644 (file)
--- a/ipc/uapi_js.go
+++ b/ipc/uapi_wasm.go
@@ -5,7 +5,7 @@
 
 package ipc
 
-// Made up sentinel error codes for the js/wasm platform.
+// Made up sentinel error codes for {js,wasip1}/wasm.
 const (
        IpcErrorIO        = 1
        IpcErrorInvalid   = 2

diff --git a/rwcancel/rwcancel.go b/rwcancel/rwcancel.go
index 63e1510b104c38e8e45d862e9ad669a57b0d0aba..e397c0e8ae19d77307552d15a2c927745e45af1e 100644 (file)
--- a/rwcancel/rwcancel.go
+++ b/rwcancel/rwcancel.go
@@ -1,4 +1,4 @@
-//go:build !windows && !js
+//go:build !windows && !wasm
 
 /* SPDX-License-Identifier: MIT
  *

diff --git a/rwcancel/rwcancel_stub.go b/rwcancel/rwcancel_stub.go
index 182940b32eb3731210dad6431404c3e9e57f2057..2a98b2b4ad7c6e6e3501b5ef85a840198835482c 100644 (file)
--- a/rwcancel/rwcancel_stub.go
+++ b/rwcancel/rwcancel_stub.go
@@ -1,4 +1,4 @@
-//go:build windows || js
+//go:build windows || wasm
 
 // SPDX-License-Identifier: MIT