SERVER-40803 Set cross compilation targeting flags for darwin variants

7 files changed, 14 insertions, 15 deletions

diff --git a/etc/scons/xcode_ios.vars b/etc/scons/xcode_ios.vars
index 007fad1dfda..2c46ef1152f 100644
--- a/etc/scons/xcode_ios.vars
+++ b/etc/scons/xcode_ios.vars
@@ -7,9 +7,8 @@ CXX = subprocess.check_output(['xcrun', '-f', '--sdk', 'iphoneos', 'clang++']).d
 
 sdk_path = subprocess.check_output(['xcrun', '--sdk', 'iphoneos', '--show-sdk-path']).decode('utf-8').strip()
 
-CCFLAGS = "-isysroot {} -miphoneos-version-min=11.0 -arch arm64 -fembed-bitcode".format(sdk_path)
-LINKFLAGS = "-Wl,-syslibroot,{} -miphoneos-version-min=11.0 -arch arm64 -fembed-bitcode".format(sdk_path)
+CCFLAGS = "-isysroot {} -miphoneos-version-min=11.0 -target darwin17.0.0 -arch arm64 -fembed-bitcode".format(sdk_path)
+LINKFLAGS = "-Wl,-syslibroot,{} -miphoneos-version-min=11.0 -target darwin17.0.0 -arch arm64 -fembed-bitcode".format(sdk_path)
 
 TARGET_OS = "iOS"
 TARGET_ARCH = "aarch64"
-
diff --git a/etc/scons/xcode_ios_sim.vars b/etc/scons/xcode_ios_sim.vars
index ec9869dd314..2cbfa215849 100644
--- a/etc/scons/xcode_ios_sim.vars
+++ b/etc/scons/xcode_ios_sim.vars
@@ -7,8 +7,8 @@ CXX = subprocess.check_output(['xcrun', '-f', '--sdk', 'iphonesimulator', 'clang
 
 sdk_path = subprocess.check_output(['xcrun', '--sdk', 'iphonesimulator', '--show-sdk-path']).decode('utf-8').strip()
 
-CCFLAGS = "-isysroot {} -miphoneos-version-min=11.0 -arch x86_64 -fembed-bitcode".format(sdk_path)
-LINKFLAGS = "-Wl,-syslibroot,{} -miphoneos-version-min=11.0 -arch x86_64 -fembed-bitcode".format(sdk_path)
+CCFLAGS = "-isysroot {} -miphoneos-version-min=11.0 -target darwin17.0.0 -arch x86_64 -fembed-bitcode".format(sdk_path)
+LINKFLAGS = "-Wl,-syslibroot,{} -miphoneos-version-min=11.0 -target darwin17.0.0 -arch x86_64 -fembed-bitcode".format(sdk_path)
 
 TARGET_OS = "iOS-sim"
 TARGET_ARCH = "x86_64"
diff --git a/etc/scons/xcode_macosx.vars b/etc/scons/xcode_macosx.vars
index e5ff09079cd..cefe380ccf9 100644
--- a/etc/scons/xcode_macosx.vars
+++ b/etc/scons/xcode_macosx.vars
@@ -7,5 +7,5 @@ CXX = subprocess.check_output(['xcrun', '-f', '--sdk', 'macosx', 'clang++']).dec
 
 sdk_path = subprocess.check_output(['xcrun', '--sdk', 'macosx', '--show-sdk-path']).decode('utf-8').strip()
 
-CCFLAGS = "-isysroot {} -mmacosx-version-min=10.12".format(sdk_path)
-LINKFLAGS = "-Wl,-syslibroot,{} -mmacosx-version-min=10.12".format(sdk_path)
+CCFLAGS = "-isysroot {} -mmacosx-version-min=10.12 -target darwin16.0.0 -arch x86_64".format(sdk_path)
+LINKFLAGS = "-Wl,-syslibroot,{} -mmacosx-version-min=10.12 -target darwin16.0.0 -arch x86_64".format(sdk_path)
diff --git a/etc/scons/xcode_tvos.vars b/etc/scons/xcode_tvos.vars
index 7dc17c8aa13..8acf7053b43 100644
--- a/etc/scons/xcode_tvos.vars
+++ b/etc/scons/xcode_tvos.vars
@@ -7,8 +7,8 @@ CXX = subprocess.check_output(['xcrun', '-f', '--sdk', 'appletvos', 'clang++']).
 
 sdk_path = subprocess.check_output(['xcrun', '--sdk', 'appletvos', '--show-sdk-path']).decode('utf-8').strip()
 
-CCFLAGS = "-isysroot {} -mtvos-version-min=11.0 -arch arm64 -fembed-bitcode".format(sdk_path)
-LINKFLAGS = "-Wl,-syslibroot,{} -mtvos-version-min=11.0 -arch arm64 -fembed-bitcode".format(sdk_path)
+CCFLAGS = "-isysroot {} -mtvos-version-min=11.0 -target darwin17.0.0 -arch arm64 -fembed-bitcode".format(sdk_path)
+LINKFLAGS = "-Wl,-syslibroot,{} -mtvos-version-min=11.0 -target darwin17.0.0 -arch arm64 -fembed-bitcode".format(sdk_path)
 
 TARGET_OS = "tvOS"
 TARGET_ARCH = "aarch64"
diff --git a/etc/scons/xcode_tvos_sim.vars b/etc/scons/xcode_tvos_sim.vars
index 1e0cd8c10b0..c71b37cfebb 100644
--- a/etc/scons/xcode_tvos_sim.vars
+++ b/etc/scons/xcode_tvos_sim.vars
@@ -7,8 +7,8 @@ CXX = subprocess.check_output(['xcrun', '-f', '--sdk', 'appletvsimulator', 'clan
 
 sdk_path = subprocess.check_output(['xcrun', '--sdk', 'appletvsimulator', '--show-sdk-path']).decode('utf-8').strip()
 
-CCFLAGS = "-isysroot {} -mtvos-version-min=11.0 -arch x86_64 -fembed-bitcode".format(sdk_path)
-LINKFLAGS = "-Wl,-syslibroot,{} -mtvos-version-min=11.0 -arch x86_64 -fembed-bitcode".format(sdk_path)
+CCFLAGS = "-isysroot {} -mtvos-version-min=11.0 -target darwin17.0.0 -arch x86_64 -fembed-bitcode".format(sdk_path)
+LINKFLAGS = "-Wl,-syslibroot,{} -mtvos-version-min=11.0 -target darwin17.0.0 -arch x86_64 -fembed-bitcode".format(sdk_path)
 
 TARGET_OS = "tvOS-sim"
 TARGET_ARCH = "x86_64"
diff --git a/etc/scons/xcode_watchos.vars b/etc/scons/xcode_watchos.vars
index 6c49ed7034a..1df5e231823 100644
--- a/etc/scons/xcode_watchos.vars
+++ b/etc/scons/xcode_watchos.vars
@@ -7,8 +7,8 @@ CXX = subprocess.check_output(['xcrun', '-f', '--sdk', 'watchos', 'clang++']).de
 
 sdk_path = subprocess.check_output(['xcrun', '--sdk', 'watchos', '--show-sdk-path']).decode('utf-8').strip()
 
-CCFLAGS = "-isysroot {} -mwatchos-version-min=4.2 -arch armv7k -fembed-bitcode -fapplication-extension".format(sdk_path)
-LINKFLAGS = "-Wl,-syslibroot,{} -mwatchos-version-min=4.2 -arch armv7k -fembed-bitcode -fapplication-extension".format(sdk_path)
+CCFLAGS = "-isysroot {} -mwatchos-version-min=4.2 -target darwin17.0.0 -arch armv7k -fembed-bitcode -fapplication-extension".format(sdk_path)
+LINKFLAGS = "-Wl,-syslibroot,{} -mwatchos-version-min=4.2 -target darwin17.0.0 -arch armv7k -fembed-bitcode -fapplication-extension".format(sdk_path)
 
 TARGET_OS = "watchOS"
 TARGET_ARCH = "arm"
diff --git a/etc/scons/xcode_watchos_sim.vars b/etc/scons/xcode_watchos_sim.vars
index b237c5c2039..0e799e6a13a 100644
--- a/etc/scons/xcode_watchos_sim.vars
+++ b/etc/scons/xcode_watchos_sim.vars
@@ -7,8 +7,8 @@ CXX = subprocess.check_output(['xcrun', '-f', '--sdk', 'watchsimulator', 'clang+
 
 sdk_path = subprocess.check_output(['xcrun', '--sdk', 'watchsimulator', '--show-sdk-path']).decode('utf-8').strip()
 
-CCFLAGS = "-isysroot {} -mwatchos-version-min=4.2 -arch i386 -fembed-bitcode -fapplication-extension".format(sdk_path)
-LINKFLAGS = "-Wl,-syslibroot,{} -mwatchos-version-min=4.2 -arch i386 -fembed-bitcode -fapplication-extension".format(sdk_path)
+CCFLAGS = "-isysroot {} -mwatchos-version-min=4.2 -target darwin17.0.0 -arch i386 -fembed-bitcode -fapplication-extension".format(sdk_path)
+LINKFLAGS = "-Wl,-syslibroot,{} -mwatchos-version-min=4.2 -target darwin17.0.0 -arch i386 -fembed-bitcode -fapplication-extension".format(sdk_path)
 
 TARGET_OS = "watchOS-sim"
 TARGET_ARCH = "i386"