summaryrefslogtreecommitdiff
path: root/etc/scons
diff options
context:
space:
mode:
authorAndrew Morrow <acm@mongodb.com>2018-10-19 17:53:43 -0400
committerAndrew Morrow <acm@mongodb.com>2018-10-23 10:58:49 -0400
commit525d3c67f9f21e22e7cca0c7ba96e3d709676140 (patch)
tree74e7d405ff70ccbccb9895ff6f017f2917fd5f7e /etc/scons
parent1ee882eee876b416cf6a547554f2f0da3cbb9022 (diff)
downloadmongo-525d3c67f9f21e22e7cca0c7ba96e3d709676140.tar.gz
SERVER-37691 Build WatchOS SDKs with -fapplication-extension
(cherry picked from commit 0f1a414014713e1420c3d425f4f00d02d8a3611c)
Diffstat (limited to 'etc/scons')
-rw-r--r--etc/scons/xcode_watchos.vars4
-rw-r--r--etc/scons/xcode_watchos_sim.vars4
2 files changed, 4 insertions, 4 deletions
diff --git a/etc/scons/xcode_watchos.vars b/etc/scons/xcode_watchos.vars
index b69acbf9bd0..f6b4843cd7f 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++']).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 -fembed-bitcode".format(sdk_path)
+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)
TARGET_OS = "watchOS"
TARGET_ARCH = "arm"
diff --git a/etc/scons/xcode_watchos_sim.vars b/etc/scons/xcode_watchos_sim.vars
index 582ea25b23d..4cd2b12982c 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 -fembed-bitcode".format(sdk_path)
-LINKFLAGS = "-Wl,-syslibroot,{} -mwatchos-version-min=4.2 -arch i386 -fembed-bitcode".format(sdk_path)
+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)
TARGET_OS = "watchOS-sim"
TARGET_ARCH = "i386"