Skip to content

Commit 67e9128

Browse files
bradfitzbradfitz
committed
all: adjust some build tags for wasi
A start. Updates tailscale#8320 Change-Id: I64057f977be51ba63ce635c56d67de7ecec415d1 Signed-off-by: Brad Fitzpatrick <[email protected]>
1 parent 63b1a4e commit 67e9128

File tree

11 files changed

+18
-9
lines changed

11 files changed

+18
-9
lines changed

‎cmd/derper/depaware.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa
180180
bytes from bufio+
181181
compress/flate from compress/gzip+
182182
compress/gzip from internal/profile+
183+
L compress/zlib from debug/elf
183184
container/list from crypto/tls+
184185
context from crypto/tls+
185186
crypto from crypto/ecdsa+
@@ -203,6 +204,8 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa
203204
crypto/tls from golang.org/x/crypto/acme+
204205
crypto/x509 from crypto/tls+
205206
crypto/x509/pkix from crypto/x509+
207+
L debug/dwarf from debug/elf
208+
L debug/elf from golang.org/x/sys/unix
206209
embed from crypto/internal/nistec+
207210
encoding from encoding/json+
208211
encoding/asn1 from crypto/x509+
@@ -218,6 +221,7 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa
218221
fmt from compress/flate+
219222
go/token from google.golang.org/protobuf/internal/strs
220223
hash from crypto+
224+
L hash/adler32 from compress/zlib
221225
hash/crc32 from compress/gzip+
222226
hash/fnv from google.golang.org/protobuf/internal/detrand
223227
hash/maphash from go4.org/mem

‎cmd/tailscale/depaware.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep
177177
bytes from bufio+
178178
compress/flate from compress/gzip+
179179
compress/gzip from net/http
180-
compress/zlib from image/png
180+
compress/zlib from image/png+
181181
container/list from crypto/tls+
182182
context from crypto/tls+
183183
crypto from crypto/ecdsa+
@@ -202,6 +202,8 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep
202202
crypto/x509 from crypto/tls+
203203
crypto/x509/pkix from crypto/x509+
204204
database/sql/driver from github.com/google/uuid
205+
L debug/dwarf from debug/elf
206+
L debug/elf from golang.org/x/sys/unix
205207
embed from tailscale.com/cmd/tailscale/cli+
206208
encoding from encoding/json+
207209
encoding/asn1 from crypto/x509+

‎cmd/tailscaled/depaware.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de
398398
bytes from bufio+
399399
compress/flate from compress/gzip+
400400
compress/gzip from golang.org/x/net/http2+
401+
L compress/zlib from debug/elf
401402
container/heap from gvisor.dev/gvisor/pkg/tcpip/transport/tcp
402403
container/list from crypto/tls+
403404
context from crypto/tls+
@@ -422,6 +423,8 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de
422423
crypto/tls from github.com/tcnksm/go-httpstat+
423424
crypto/x509 from crypto/tls+
424425
crypto/x509/pkix from crypto/x509+
426+
L debug/dwarf from debug/elf
427+
L debug/elf from golang.org/x/sys/unix
425428
embed from tailscale.com+
426429
encoding from encoding/json+
427430
encoding/asn1 from crypto/x509+
@@ -437,7 +440,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de
437440
flag from net/http/httptest+
438441
fmt from compress/flate+
439442
hash from crypto+
440-
hash/adler32 from tailscale.com/ipn/ipnlocal
443+
hash/adler32 from tailscale.com/ipn/ipnlocal+
441444
hash/crc32 from compress/gzip+
442445
hash/fnv from tailscale.com/wgengine/magicsock+
443446
hash/maphash from go4.org/mem

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ require (
7979
golang.org/x/net v0.10.0
8080
golang.org/x/oauth2 v0.7.0
8181
golang.org/x/sync v0.2.0
82-
golang.org/x/sys v0.8.0
82+
golang.org/x/sys v0.8.1-0.20230609144347-5059a07aa46a
8383
golang.org/x/term v0.8.0
8484
golang.org/x/time v0.3.0
8585
golang.org/x/tools v0.9.1

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1432,8 +1432,8 @@ golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
14321432
golang.org/x/sys v0.4.1-0.20230131160137-e7d7f63158de/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
14331433
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
14341434
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1435-
golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
1436-
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1435+
golang.org/x/sys v0.8.1-0.20230609144347-5059a07aa46a h1:qMsju+PNttu/NMbq8bQ9waDdxgJMu9QNoUDuhnBaYt0=
1436+
golang.org/x/sys v0.8.1-0.20230609144347-5059a07aa46a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
14371437
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
14381438
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
14391439
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=

‎logtail/filch/filch_unix.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Tailscale Inc & AUTHORS
22
// SPDX-License-Identifier: BSD-3-Clause
33

4-
//go:build !windows && !js
4+
//go:build !windows && !wasm
55

66
package filch
77

‎logtail/filch/filch_js.go renamed to ‎logtail/filch/filch_wasm.go

File renamed without changes.

‎paths/paths_unix.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Tailscale Inc & AUTHORS
22
// SPDX-License-Identifier: BSD-3-Clause
33

4-
//go:build !windows && !js
4+
//go:build !windows && !js && !wasip1
55

66
package paths
77

‎paths/paths_js.go renamed to ‎paths/paths_wasm.go

File renamed without changes.

‎types/logger/rusage_stub.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Tailscale Inc & AUTHORS
22
// SPDX-License-Identifier: BSD-3-Clause
33

4-
//go:build windows || js
4+
//go:build windows || js || wasip1
55

66
package logger
77

‎types/logger/rusage_syscall.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Tailscale Inc & AUTHORS
22
// SPDX-License-Identifier: BSD-3-Clause
33

4-
//go:build !windows && !js
4+
//go:build !windows && !js && !wasip1
55

66
package logger
77

0 commit comments

Comments
 (0)