tool/gocross: properly set simulator deployment target (#8355)

Fixes tailscale/corp#11876

Signed-off-by: Nick O'Neill <nick@tailscale.com>
raggi/heartbeat-timebomb
Nick O'Neill 1 year ago committed by GitHub
parent c1cbd41fdc
commit c783f28228
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -111,7 +111,11 @@ func autoflagsForTest(argv []string, env *Environment, goroot, nativeGOOS, nativ
// e.g. -mmacosx-version-min=11.3, -miphoneos-version-min=15.0 // e.g. -mmacosx-version-min=11.3, -miphoneos-version-min=15.0
switch { switch {
case env.IsSet("IPHONEOS_DEPLOYMENT_TARGET"): case env.IsSet("IPHONEOS_DEPLOYMENT_TARGET"):
xcodeFlags = append(xcodeFlags, "-miphoneos-version-min="+env.Get("IPHONEOS_DEPLOYMENT_TARGET", "")) if env.Get("TARGET_DEVICE_PLATFORM_NAME", "") == "iphonesimulator" {
xcodeFlags = append(xcodeFlags, "-miphonesimulator-version-min="+env.Get("IPHONEOS_DEPLOYMENT_TARGET", ""))
} else {
xcodeFlags = append(xcodeFlags, "-miphoneos-version-min="+env.Get("IPHONEOS_DEPLOYMENT_TARGET", ""))
}
case env.IsSet("MACOSX_DEPLOYMENT_TARGET"): case env.IsSet("MACOSX_DEPLOYMENT_TARGET"):
xcodeFlags = append(xcodeFlags, "-mmacosx-version-min="+env.Get("MACOSX_DEPLOYMENT_TARGET", "")) xcodeFlags = append(xcodeFlags, "-mmacosx-version-min="+env.Get("MACOSX_DEPLOYMENT_TARGET", ""))
case env.IsSet("TVOS_DEPLOYMENT_TARGET"): case env.IsSet("TVOS_DEPLOYMENT_TARGET"):

Loading…
Cancel
Save