SERVER-35078 Build darwin-ish SDKs with bitcode

7 files changed, 11 insertions, 10 deletions

diff --git a/SConstruct b/SConstruct
index 31ca80632b9..5252e5ee217 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1744,7 +1744,8 @@ if env.TargetOSIs('posix'):
     # SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program
     # startup.
     if env.TargetOSIs('darwin'):
-        env.Append( LINKFLAGS=["-Wl,-bind_at_load"] )
+        if env.TargetOSIs('macOS'):
+            env.Append( LINKFLAGS=["-Wl,-bind_at_load"] )
     else:
         env.Append( LINKFLAGS=["-Wl,-z,now"] )
         env.Append( LINKFLAGS=["-rdynamic"] )
diff --git a/etc/scons/xcode_ios.vars b/etc/scons/xcode_ios.vars
index 8c268cecaf3..4ae016d2e51 100644
--- a/etc/scons/xcode_ios.vars
+++ b/etc/scons/xcode_ios.vars
@@ -8,7 +8,7 @@ CXX = subprocess.check_output(['xcrun', '-f', '--sdk', 'iphoneos', 'clang++']).s
 sdk_path = subprocess.check_output(['xcrun', '--sdk', 'iphoneos', '--show-sdk-path']).strip()
 
 CCFLAGS = "-isysroot {} -miphoneos-version-min=10.2 -arch arm64 -fembed-bitcode".format(sdk_path)
-LINKFLAGS = "-Wl,-syslibroot,{} -miphoneos-version-min=10.2 -arch arm64".format(sdk_path)
+LINKFLAGS = "-Wl,-syslibroot,{} -miphoneos-version-min=10.2 -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 cbf6aaaf8aa..cc13e2177fc 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']).strip()
 
-CCFLAGS = "-isysroot {} -miphoneos-version-min=10.2 -arch x86_64".format(sdk_path)
-LINKFLAGS = "-Wl,-syslibroot,{} -miphoneos-version-min=10.2 -arch x86_64".format(sdk_path)
+CCFLAGS = "-isysroot {} -miphoneos-version-min=10.2 -arch x86_64 -fembed-bitcode".format(sdk_path)
+LINKFLAGS = "-Wl,-syslibroot,{} -miphoneos-version-min=10.2 -arch x86_64 -fembed-bitcode".format(sdk_path)
 
 TARGET_OS = "iOS-sim"
 TARGET_ARCH = "x86_64"
diff --git a/etc/scons/xcode_tvos.vars b/etc/scons/xcode_tvos.vars
index 37842342864..10c4a57c3fb 100644
--- a/etc/scons/xcode_tvos.vars
+++ b/etc/scons/xcode_tvos.vars
@@ -8,7 +8,7 @@ CXX = subprocess.check_output(['xcrun', '-f', '--sdk', 'appletvos', 'clang++']).
 sdk_path = subprocess.check_output(['xcrun', '--sdk', 'appletvos', '--show-sdk-path']).strip()
 
 CCFLAGS = "-isysroot {} -mtvos-version-min=10.2 -arch arm64 -fembed-bitcode".format(sdk_path)
-LINKFLAGS = "-Wl,-syslibroot,{} -mtvos-version-min=10.2 -arch arm64".format(sdk_path)
+LINKFLAGS = "-Wl,-syslibroot,{} -mtvos-version-min=10.2 -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 6f680cfaa8b..b795cd0c2eb 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']).strip()
 
-CCFLAGS = "-isysroot {} -mtvos-version-min=10.2 -arch x86_64".format(sdk_path)
-LINKFLAGS = "-Wl,-syslibroot,{} -mtvos-version-min=10.2 -arch x86_64".format(sdk_path)
+CCFLAGS = "-isysroot {} -mtvos-version-min=10.2 -arch x86_64 -fembed-bitcode".format(sdk_path)
+LINKFLAGS = "-Wl,-syslibroot,{} -mtvos-version-min=10.2 -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 45ae87c9c9f..b69acbf9bd0 100644
--- a/etc/scons/xcode_watchos.vars
+++ b/etc/scons/xcode_watchos.vars
@@ -8,7 +8,7 @@ CXX = subprocess.check_output(['xcrun', '-f', '--sdk', 'watchos', 'clang++']).st
 sdk_path = subprocess.check_output(['xcrun', '--sdk', 'watchos', '--show-sdk-path']).strip()
 
 CCFLAGS = "-isysroot {} -mwatchos-version-min=4.2 -arch armv7k -fembed-bitcode".format(sdk_path)
-LINKFLAGS = "-Wl,-syslibroot,{} -mwatchos-version-min=4.2 -arch armv7k".format(sdk_path)
+LINKFLAGS = "-Wl,-syslibroot,{} -mwatchos-version-min=4.2 -arch armv7k -fembed-bitcode".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 e3e0310666b..582ea25b23d 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']).strip()
 
-CCFLAGS = "-isysroot {} -mwatchos-version-min=4.2 -arch i386".format(sdk_path)
-LINKFLAGS = "-Wl,-syslibroot,{} -mwatchos-version-min=4.2 -arch i386".format(sdk_path)
+CCFLAGS = "-isysroot {} -mwatchos-version-min=4.2 -arch i386 -fembed-bitcode".format(sdk_path)
+LINKFLAGS = "-Wl,-syslibroot,{} -mwatchos-version-min=4.2 -arch i386 -fembed-bitcode".format(sdk_path)
 
 TARGET_OS = "watchOS-sim"
 TARGET_ARCH = "i386"