diff options
| author | Andrew Morrow <acm@mongodb.com> | 2019-03-17 09:24:39 -0400 |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2019-03-27 12:52:13 -0400 |
| commit | bb2a44643e2638b0850bcca8d11f88351f780642 (patch) | |
| tree | 5213b4104cdc8671fdae44742fbdabb57bd0e0b0 | |
| parent | b87626700777575a9ffa1beab038f90fa0c2c96a (diff) | |
| download | mongo-bb2a44643e2638b0850bcca8d11f88351f780642.tar.gz | |
SERVER-40179 Require tvOS 11 for embedded to allow use of sized allocation
| -rw-r--r-- | etc/evergreen.yml | 6 | ||||
| -rw-r--r-- | etc/scons/xcode_tvos.vars | 4 | ||||
| -rw-r--r-- | etc/scons/xcode_tvos_sim.vars | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 3a5ea5609c1..48c9bb65a8e 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -10449,7 +10449,7 @@ buildvariants: --variables-files=etc/scons/xcode_tvos.vars FRAMEWORKPATH='$BUILD_ROOT/mongo-embedded-sdk-$MONGO_VERSION/Frameworks' --lto - cdriver_cmake_osx_deployment_target: "10.2" + cdriver_cmake_osx_deployment_target: "11.0" cdriver_cmake_flags: >- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_OSX_SYSROOT="$(xcrun --sdk appletvos --show-sdk-path)" @@ -10481,7 +10481,7 @@ buildvariants: --variables-files=etc/scons/xcode_tvos_sim.vars FRAMEWORKPATH='$BUILD_ROOT/mongo-embedded-sdk-$MONGO_VERSION/Frameworks' --lto - cdriver_cmake_osx_deployment_target: "10.2" + cdriver_cmake_osx_deployment_target: "11.0" cdriver_cmake_flags: >- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_OSX_SYSROOT="$(xcrun --sdk appletvsimulator --show-sdk-path)" @@ -10497,7 +10497,7 @@ buildvariants: disable_unit_tests: true enable_embedded_tests: ios_tvos_simulator ios_sim_device: Apple-TV-1080p - ios_sim_runtime: tvOS-10-2 + ios_sim_runtime: tvOS-11-0 dump_scons_config_on_failure: true tasks: - name: embedded_sdk_build_and_test diff --git a/etc/scons/xcode_tvos.vars b/etc/scons/xcode_tvos.vars index 10c4a57c3fb..fd1a3b1fdc5 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']).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 -fembed-bitcode".format(sdk_path) +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) TARGET_OS = "tvOS" TARGET_ARCH = "aarch64" diff --git a/etc/scons/xcode_tvos_sim.vars b/etc/scons/xcode_tvos_sim.vars index b795cd0c2eb..0ab352189ec 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 -fembed-bitcode".format(sdk_path) -LINKFLAGS = "-Wl,-syslibroot,{} -mtvos-version-min=10.2 -arch x86_64 -fembed-bitcode".format(sdk_path) +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) TARGET_OS = "tvOS-sim" TARGET_ARCH = "x86_64" |