diff options
| author | Andrew Morrow <acm@mongodb.com> | 2018-10-19 17:53:43 -0400 |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2018-10-23 10:58:49 -0400 |
| commit | 525d3c67f9f21e22e7cca0c7ba96e3d709676140 (patch) | |
| tree | 74e7d405ff70ccbccb9895ff6f017f2917fd5f7e | |
| parent | 1ee882eee876b416cf6a547554f2f0da3cbb9022 (diff) | |
| download | mongo-525d3c67f9f21e22e7cca0c7ba96e3d709676140.tar.gz | |
SERVER-37691 Build WatchOS SDKs with -fapplication-extension
(cherry picked from commit 0f1a414014713e1420c3d425f4f00d02d8a3611c)
| -rw-r--r-- | etc/evergreen.yml | 8 | ||||
| -rw-r--r-- | etc/scons/xcode_watchos.vars | 4 | ||||
| -rw-r--r-- | etc/scons/xcode_watchos_sim.vars | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index f0757f987d5..ceb5ecc9b4e 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -10531,8 +10531,8 @@ buildvariants: -DENABLE_SASL=OFF -DENABLE_ZLIB=OFF -DENABLE_SNAPPY=OFF - -DCMAKE_C_FLAGS="-fembed-bitcode -flto" - -DCMAKE_SHARED_LINKER_FLAGS="-fembed-bitcode -flto" + -DCMAKE_C_FLAGS="-fembed-bitcode -flto -fapplication-extension" + -DCMAKE_SHARED_LINKER_FLAGS="-fembed-bitcode -flto -fapplication-extension" disable_unit_tests: true dump_scons_config_on_failure: true tasks: @@ -10630,8 +10630,8 @@ buildvariants: -DENABLE_SASL=OFF -DENABLE_ZLIB=OFF -DENABLE_SNAPPY=OFF - -DCMAKE_C_FLAGS="-fembed-bitcode -flto" - -DCMAKE_SHARED_LINKER_FLAGS="-fembed-bitcode -flto" + -DCMAKE_C_FLAGS="-fembed-bitcode -flto -fapplication-extension" + -DCMAKE_SHARED_LINKER_FLAGS="-fembed-bitcode -flto -fapplication-extension" disable_unit_tests: true enable_embedded_tests: ios_tvos_simulator ios_sim_device: Apple-Watch-Series-3-42mm 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" |