From c783f28228edcf15c22dc6a933bf96c2e7ae8895 Mon Sep 17 00:00:00 2001
From: Nick O'Neill <nick@tailscale.com>
Date: Thu, 15 Jun 2023 12:42:30 -0700
Subject: [PATCH] tool/gocross: properly set simulator deployment target
(#8355)
Fixes tailscale/corp#11876
Signed-off-by: Nick O'Neill <nick@tailscale.com>
---
tool/gocross/autoflags.go | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tool/gocross/autoflags.go b/tool/gocross/autoflags.go
index 691317c64..b914759fb 100644
--- a/tool/gocross/autoflags.go
+++ b/tool/gocross/autoflags.go
@@ -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
switch {
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"):
xcodeFlags = append(xcodeFlags, "-mmacosx-version-min="+env.Get("MACOSX_DEPLOYMENT_TARGET", ""))
case env.IsSet("TVOS_DEPLOYMENT_TARGET"):