From 0a74d46568d0e06dd478e3b1d0c05246e3abc7f7 Mon Sep 17 00:00:00 2001 From: Andrea Barisani Date: Wed, 30 Aug 2023 14:23:38 +0200 Subject: [PATCH] adjust build tags for tamago Signed-off-by: Andrea Barisani --- logtail/filch/filch_unix.go | 2 +- net/interfaces/interfaces.go | 2 +- net/tstun/tun.go | 2 +- paths/paths_unix.go | 2 +- types/logger/rusage_stub.go | 2 +- types/logger/rusage_syscall.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/logtail/filch/filch_unix.go b/logtail/filch/filch_unix.go index 5c4552dec..2eae70ace 100644 --- a/logtail/filch/filch_unix.go +++ b/logtail/filch/filch_unix.go @@ -1,7 +1,7 @@ // Copyright (c) Tailscale Inc & AUTHORS // SPDX-License-Identifier: BSD-3-Clause -//go:build !windows && !wasm && !plan9 +//go:build !windows && !wasm && !plan9 && !tamago package filch diff --git a/net/interfaces/interfaces.go b/net/interfaces/interfaces.go index 1e00368d1..cf467fc7b 100644 --- a/net/interfaces/interfaces.go +++ b/net/interfaces/interfaces.go @@ -396,7 +396,7 @@ func (s *State) HasPAC() bool { return s != nil && s.PAC != "" } // AnyInterfaceUp reports whether any interface seems like it has Internet access. func (s *State) AnyInterfaceUp() bool { - if runtime.GOOS == "js" { + if runtime.GOOS == "js" || runtime.GOOS == "tamago" { return true } return s != nil && (s.HaveV4 || s.HaveV6) diff --git a/net/tstun/tun.go b/net/tstun/tun.go index 079a10b42..de0db6d1e 100644 --- a/net/tstun/tun.go +++ b/net/tstun/tun.go @@ -1,7 +1,7 @@ // Copyright (c) Tailscale Inc & AUTHORS // SPDX-License-Identifier: BSD-3-Clause -//go:build !wasm && !plan9 +//go:build !wasm && !plan9 && !tamago // Package tun creates a tuntap device, working around OS-specific // quirks if necessary. diff --git a/paths/paths_unix.go b/paths/paths_unix.go index 6a5b8c1cf..fb081cdf4 100644 --- a/paths/paths_unix.go +++ b/paths/paths_unix.go @@ -1,7 +1,7 @@ // Copyright (c) Tailscale Inc & AUTHORS // SPDX-License-Identifier: BSD-3-Clause -//go:build !windows && !wasm && !plan9 +//go:build !windows && !wasm && !plan9 && !tamago package paths diff --git a/types/logger/rusage_stub.go b/types/logger/rusage_stub.go index e9698d715..f646f1e1e 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 || wasm || plan9 +//go:build windows || wasm || plan9 || tamago package logger diff --git a/types/logger/rusage_syscall.go b/types/logger/rusage_syscall.go index ebf98280b..2871b66c6 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 && !wasm && !plan9 +//go:build !windows && !wasm && !plan9 && !tamago package logger