From bdc7a61c24fda0b1a788ac76e9f70f81a3f370b8 Mon Sep 17 00:00:00 2001 From: Mihai Parparita Date: Tue, 11 Apr 2023 09:47:08 -0700 Subject: [PATCH] tool/gocross: add ts_macext build tag for Xcode builds It's used to control various opt-in functionality for the macOS and iOS apps, and was lost in the migration to gocross. Updates tailscale/tailscale#7769 Signed-off-by: Mihai Parparita --- tool/gocross/autoflags.go | 4 ++++ tool/gocross/autoflags_test.go | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tool/gocross/autoflags.go b/tool/gocross/autoflags.go index f0984c943..0fd46c4fa 100644 --- a/tool/gocross/autoflags.go +++ b/tool/gocross/autoflags.go @@ -102,6 +102,10 @@ func autoflagsForTest(argv []string, env *Environment, goroot, nativeGOOS, nativ cgo = nativeGOOS == "darwin" tags = append(tags, "omitidna", "omitpemdecrypt") if env.IsSet("XCODE_VERSION_ACTUAL") { + // If we're building via Xcode, we must be making the extension + // version (as opposed to tailscaled on Mac). + tags = append(tags, "ts_macext") + var xcodeFlags []string // Minimum OS version being targeted, results in // e.g. -mmacosx-version-min=11.3, -miphoneos-version-min=15.0 diff --git a/tool/gocross/autoflags_test.go b/tool/gocross/autoflags_test.go index 3ed1fa7ea..c8007c40d 100644 --- a/tool/gocross/autoflags_test.go +++ b/tool/gocross/autoflags_test.go @@ -301,7 +301,7 @@ TS_LINK_FAIL_REFLECT=0 (was )`, wantArgv: []string{ "gocross", "build", "-trimpath", - "-tags=tailscale_go,omitidna,omitpemdecrypt", + "-tags=tailscale_go,omitidna,omitpemdecrypt,ts_macext", "-ldflags", "-X tailscale.com/version.longStamp=1.2.3-long -X tailscale.com/version.shortStamp=1.2.3 -X tailscale.com/version.gitCommitStamp=abcd -X tailscale.com/version.extraGitCommitStamp=defg -w", "./cmd/tailcontrol", }, @@ -333,7 +333,7 @@ TS_LINK_FAIL_REFLECT=1 (was )`, wantArgv: []string{ "gocross", "build", "-trimpath", - "-tags=tailscale_go,omitidna,omitpemdecrypt", + "-tags=tailscale_go,omitidna,omitpemdecrypt,ts_macext", "-ldflags", "-X tailscale.com/version.longStamp=1.2.3-long -X tailscale.com/version.shortStamp=1.2.3 -X tailscale.com/version.gitCommitStamp=abcd -X tailscale.com/version.extraGitCommitStamp=defg -w", "./cmd/tailcontrol", },