Skip to content

Commit 76aaa5d

Browse files
committed
[Threading] Fix compatibility library deployment target issue.
The threading library is being pulled into the compatibility libraries, but in order to do that we need to make sure it gets built with the correct deployment target. (Which means we need a special version for the compatibility libraries.) rdar://96709941
1 parent 224cac5 commit 76aaa5d

File tree

5 files changed

+19
-12
lines changed

5 files changed

+19
-12
lines changed

stdlib/public/Threading/CMakeLists.txt

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,18 @@ add_swift_target_library(swiftThreading OBJECT_LIBRARY
1111
"${SWIFT_SOURCE_DIR}/lib/Threading/Win32.cpp"
1212
INSTALL_IN_COMPONENT never_install)
1313

14-
# This is only used by the compatibility libraries
15-
add_swift_target_library(swiftThreadingWithFatal OBJECT_LIBRARY
16-
"${SWIFT_SOURCE_DIR}/lib/Threading/C11.cpp"
17-
"${SWIFT_SOURCE_DIR}/lib/Threading/Linux.cpp"
18-
"${SWIFT_SOURCE_DIR}/lib/Threading/Pthreads.cpp"
19-
"${SWIFT_SOURCE_DIR}/lib/Threading/Win32.cpp"
20-
"${SWIFT_SOURCE_DIR}/lib/Threading/Errors.cpp"
21-
INSTALL_IN_COMPONENT never_install)
14+
if(SWIFT_STDLIB_SUPPORT_BACK_DEPLOYMENT)
15+
# This is only used by the compatibility libraries
16+
add_swift_target_library(swiftCompatibilityThreading OBJECT_LIBRARY
17+
"${SWIFT_SOURCE_DIR}/lib/Threading/C11.cpp"
18+
"${SWIFT_SOURCE_DIR}/lib/Threading/Linux.cpp"
19+
"${SWIFT_SOURCE_DIR}/lib/Threading/Pthreads.cpp"
20+
"${SWIFT_SOURCE_DIR}/lib/Threading/Win32.cpp"
21+
INSTALL_IN_COMPONENT never_install
22+
TARGET_SDKS ${SWIFT_DARWIN_PLATFORMS}
23+
DEPLOYMENT_VERSION_OSX ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_OSX}
24+
DEPLOYMENT_VERSION_IOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_IOS}
25+
DEPLOYMENT_VERSION_TVOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_TVOS}
26+
DEPLOYMENT_VERSION_WATCHOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_WATCHOS}
27+
)
28+
endif()

stdlib/toolchain/Compatibility50/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ add_swift_target_library("${library_name}" STATIC
88

99
C_COMPILE_FLAGS ${CXX_COMPILE_FLAGS}
1010
LINK_FLAGS ${CXX_LINK_FLAGS}
11-
INCORPORATE_OBJECT_LIBRARIES swiftThreading
11+
INCORPORATE_OBJECT_LIBRARIES swiftCompatibilityThreading
1212
SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
1313
DEPLOYMENT_VERSION_OSX ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_OSX}
1414
DEPLOYMENT_VERSION_IOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_IOS}

stdlib/toolchain/Compatibility51/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ add_swift_target_library("${library_name}" STATIC
99

1010
C_COMPILE_FLAGS ${CXX_COMPILE_FLAGS}
1111
LINK_FLAGS ${CXX_LINK_FLAGS}
12-
INCORPORATE_OBJECT_LIBRARIES swiftThreading
12+
INCORPORATE_OBJECT_LIBRARIES swiftCompatibilityThreading
1313
SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
1414
DEPLOYMENT_VERSION_OSX ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_OSX}
1515
DEPLOYMENT_VERSION_IOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_IOS}

stdlib/toolchain/CompatibilityConcurrency/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ add_swift_target_library("${library_name}" STATIC
77

88
C_COMPILE_FLAGS ${CXX_COMPILE_FLAGS}
99
LINK_FLAGS ${CXX_LINK_FLAGS}
10-
INCORPORATE_OBJECT_LIBRARIES swiftThreading
10+
INCORPORATE_OBJECT_LIBRARIES swiftCompatibilityThreading
1111
SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
1212
DEPLOYMENT_VERSION_OSX ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_OSX}
1313
DEPLOYMENT_VERSION_IOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_IOS}

stdlib/toolchain/CompatibilityDynamicReplacements/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ add_swift_target_library("${library_name}" STATIC
77

88
C_COMPILE_FLAGS ${CXX_COMPILE_FLAGS}
99
LINK_FLAGS ${CXX_LINK_FLAGS}
10-
INCORPORATE_OBJECT_LIBRARIES swiftThreading
10+
INCORPORATE_OBJECT_LIBRARIES swiftCompatibilityThreading
1111
SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
1212
DEPLOYMENT_VERSION_OSX ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_OSX}
1313
DEPLOYMENT_VERSION_IOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_IOS}

0 commit comments

Comments
 (0)