TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-18 02:48:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

tool/gocross: add ts_macext build tag for Xcode builds

Browse Source 
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 <mihai@tailscale.com>
This commit is contained in:
Mihai Parparita 2023-04-11 09:47:08 -07:00 committed by Mihai Parparita
parent 33b006cacf
commit bdc7a61c24
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tool/gocross/autoflags.go
View File

@ -102,6 +102,10 @@ func autoflagsForTest(argv []string, env *Environment, goroot, nativeGOOS, nativ
cgo = nativeGOOS == "darwin" cgo = nativeGOOS == "darwin"
tags = append(tags, "omitidna", "omitpemdecrypt") tags = append(tags, "omitidna", "omitpemdecrypt")
if env.IsSet("XCODE_VERSION_ACTUAL") { 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 var xcodeFlags []string
// Minimum OS version being targeted, results in // Minimum OS version being targeted, results in
// e.g. -mmacosx-version-min=11.3, -miphoneos-version-min=15.0 // e.g. -mmacosx-version-min=11.3, -miphoneos-version-min=15.0

4
tool/gocross/autoflags_test.go
View File

@ -301,7 +301,7 @@ TS_LINK_FAIL_REFLECT=0 (was <nil>)`,
wantArgv: []string{ wantArgv: []string{
"gocross", "build", "gocross", "build",
"-trimpath", "-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", "-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", "./cmd/tailcontrol",
}, },
@ -333,7 +333,7 @@ TS_LINK_FAIL_REFLECT=1 (was <nil>)`,
wantArgv: []string{ wantArgv: []string{
"gocross", "build", "gocross", "build",
"-trimpath", "-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", "-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", "./cmd/tailcontrol",
}, },