TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-22 12:58:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

tool/gocross: adjust Xcode flags to match new Xcode env

Browse Source 
Xcode changed how/what data it exports to build steps at some point
recently, so our old way of figuring out the minimum support version
for clang stopped working.

Updates tailscale/corp#4095

Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson 2023-03-03 14:38:23 -08:00 committed by Dave Anderson
parent 9526858b1e
commit 1f95bfedf7
2 changed files with 46 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tool/gocross/autoflags.go
View File

@ -104,10 +104,15 @@ func autoflagsForTest(argv []string, env *Environment, goroot, nativeGOOS, nativ
if env.IsSet("XCODE_VERSION_ACTUAL") { if env.IsSet("XCODE_VERSION_ACTUAL") {
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 // e.g. -mmacosx-version-min=11.3, -miphoneos-version-min=15.0
minOSKey := env.Get("DEPLOYMENT_TARGET_CLANG_FLAG_NAME", "") switch {
minOSVal := env.Get(env.Get("DEPLOYMENT_TARGET_CLANG_ENV_NAME", ""), "") case env.IsSet("IPHONEOS_DEPLOYMENT_TARGET"):
xcodeFlags = append(xcodeFlags, fmt.Sprintf("-%s=%s", minOSKey, minOSVal)) xcodeFlags = append(xcodeFlags, "-miphoneos-version-min="+env.Get("IPHONEOS_DEPLOYMENT_TARGET", ""))
case env.IsSet("MACOSX_DEPLOYMENT_TARGET"):
xcodeFlags = append(xcodeFlags, "-mmacosx-version-min="+env.Get("MACOSX_DEPLOYMENT_TARGET", ""))
default:
return nil, nil, fmt.Errorf("invoked by Xcode but couldn't figure out deployment target. Did Xcode change its envvars again?")
}
// Target-specific SDK directory. Must be passed as two // Target-specific SDK directory. Must be passed as two
// words ("-isysroot PATH", not "-isysroot=PATH"). // words ("-isysroot PATH", not "-isysroot=PATH").

44
tool/gocross/autoflags_test.go
View File

@ -277,13 +277,11 @@ TS_LINK_FAIL_REFLECT=1 (was <nil>)`,
{ {
name: "darwin_arm64_to_darwin_amd64_xcode", name: "darwin_arm64_to_darwin_amd64_xcode",
env: map[string]string{ env: map[string]string{
"GOOS": "darwin", "GOOS": "darwin",
"GOARCH": "amd64", "GOARCH": "amd64",
"XCODE_VERSION_ACTUAL": "1300", "XCODE_VERSION_ACTUAL": "1300",
"DEPLOYMENT_TARGET_CLANG_FLAG_NAME": "mmacosx-version-min", "MACOSX_DEPLOYMENT_TARGET": "11.3",
"MACOSX_DEPLOYMENT_TARGET": "11.3", "SDKROOT": "/my/sdk/root",
"DEPLOYMENT_TARGET_CLANG_ENV_NAME": "MACOSX_DEPLOYMENT_TARGET",
"SDKROOT": "/my/sdk/root",
}, },
argv: []string{"gocross", "build", "./cmd/tailcontrol"}, argv: []string{"gocross", "build", "./cmd/tailcontrol"},
goroot: "/goroot", goroot: "/goroot",
@ -308,6 +306,38 @@ TS_LINK_FAIL_REFLECT=0 (was <nil>)`,
"./cmd/tailcontrol", "./cmd/tailcontrol",
}, },
}, },
{
name: "darwin_amd64_to_ios_arm64_xcode",
env: map[string]string{
"GOOS": "ios",
"GOARCH": "arm64",
"XCODE_VERSION_ACTUAL": "1300",
"IPHONEOS_DEPLOYMENT_TARGET": "15.0",
"SDKROOT": "/my/sdk/root",
},
argv: []string{"gocross", "build", "./cmd/tailcontrol"},
goroot: "/goroot",
nativeGOOS: "darwin",
nativeGOARCH: "amd64",
envDiff: `CC=cc (was <nil>)
CGO_CFLAGS=-O3 -std=gnu11 -miphoneos-version-min=15.0 -isysroot /my/sdk/root -arch arm64 (was <nil>)
CGO_ENABLED=1 (was <nil>)
CGO_LDFLAGS=-miphoneos-version-min=15.0 -isysroot /my/sdk/root -arch arm64 (was <nil>)
GOARCH=arm64 (was arm64)
GOARM=5 (was <nil>)
GOMIPS=softfloat (was <nil>)
GOOS=ios (was ios)
GOROOT=/goroot (was <nil>)
TS_LINK_FAIL_REFLECT=1 (was <nil>)`,
wantArgv: []string{
"gocross", "build",
"-trimpath",
"-tags=tailscale_go,omitidna,omitpemdecrypt",
"-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",
},
},
{ {
name: "linux_amd64_to_linux_amd64_in_goroot", name: "linux_amd64_to_linux_amd64_in_goroot",
argv: []string{"go", "build", "./cmd/tailcontrol"}, argv: []string{"go", "build", "./cmd/tailcontrol"},