Skip to content

Commit 9e93ca6

Browse files
committed
[Build][Compatibility] Move compatibility deployment targets to top level.
Moved the compatibility deployment targets to the top level CMakeLists. Without this, if we build without SWIFT_BUILD_STDLIB set, the threading library doesn't see the correct values. This didn't affect local builds when testing the original fix, but it does affect B&I. rdar://96690200
1 parent 5dfa894 commit 9e93ca6

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

CMakeLists.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,15 @@ set(SWIFT_DARWIN_DEPLOYMENT_VERSION_TVOS "9.0" CACHE STRING
454454
set(SWIFT_DARWIN_DEPLOYMENT_VERSION_WATCHOS "2.0" CACHE STRING
455455
"Minimum deployment target version for watchOS")
456456

457+
#
458+
# Compatibility library deployment versions
459+
#
460+
461+
set(COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_OSX "10.9")
462+
set(COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_IOS "7.0")
463+
set(COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_TVOS "9.0")
464+
set(COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_WATCHOS "2.0")
465+
457466
#
458467
# User-configurable debugging options.
459468
#

stdlib/toolchain/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@ endif()
4646
# runtime being patched only through public ABI.
4747
list(APPEND CXX_COMPILE_FLAGS "-DSWIFT_COMPATIBILITY_LIBRARY=1")
4848

49-
set(COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_OSX "10.9")
50-
set(COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_IOS "7.0")
51-
set(COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_TVOS "9.0")
52-
set(COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_WATCHOS "2.0")
53-
5449
if(SWIFT_STDLIB_SUPPORT_BACK_DEPLOYMENT)
5550
add_subdirectory(legacy_layouts)
5651
add_subdirectory(Compatibility50)

0 commit comments

Comments
 (0)