From a24cee0d67a811e0c4cfbf2862fcb549c4a8a2d9 Mon Sep 17 00:00:00 2001 From: Josh Bleecher Snyder Date: Tue, 17 Aug 2021 10:21:52 -0700 Subject: [PATCH] all: simplify ts_macext build tags Now that we have the easier-to-parse go:build build tags, it is straightforward to simplify them. Yay. Signed-off-by: Josh Bleecher Snyder --- ipn/ipnlocal/peerapi_macios_ext.go | 5 +++-- net/dns/resolver/macios_ext.go | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ipn/ipnlocal/peerapi_macios_ext.go b/ipn/ipnlocal/peerapi_macios_ext.go index 497bebe71..8267b03e3 100644 --- a/ipn/ipnlocal/peerapi_macios_ext.go +++ b/ipn/ipnlocal/peerapi_macios_ext.go @@ -2,8 +2,9 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build (darwin && ts_macext) || (ios && ts_macext) -// +build darwin,ts_macext ios,ts_macext +//go:build ts_macext && (darwin || ios) +// +build ts_macext +// +build darwin ios package ipnlocal diff --git a/net/dns/resolver/macios_ext.go b/net/dns/resolver/macios_ext.go index 9532d65b2..e1e60765a 100644 --- a/net/dns/resolver/macios_ext.go +++ b/net/dns/resolver/macios_ext.go @@ -2,8 +2,9 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build (darwin && ts_macext) || (ios && ts_macext) -// +build darwin,ts_macext ios,ts_macext +//go:build ts_macext && (darwin || ios) +// +build ts_macext +// +build darwin ios package resolver