Skip to content

Commit 2370cd8

Browse files
committed
[cxx-interop] Lower macOS deployment target version for the Cxx module
The Cxx module does not rely on any modern OS features. It can be deployed to older macOS versions. rdar://117699474 (cherry picked from commit 00cdb66)
1 parent 415ddae commit 2370cd8

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

stdlib/public/Cxx/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ add_swift_target_library(swiftCxx STATIC NO_LINK_NAME IS_STDLIB IS_SWIFT_ONLY IS
2323
# For functionality that depends on the C++ stdlib, use C++ stdlib overlay (`swiftstd` module).
2424
-Xcc -nostdinc++
2525

26+
DEPLOYMENT_VERSION_OSX ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_OSX}
27+
2628
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
2729
DEPENDS ${SWIFT_CXX_DEPS}
2830
INSTALL_IN_COMPONENT compiler

stdlib/public/Cxx/std/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ add_swift_target_library(swiftCxxStdlib STATIC NO_LINK_NAME IS_STDLIB IS_SWIFT_O
4949
SWIFT_COMPILE_FLAGS_LINUX
5050
${SWIFT_SDK_LINUX_CXX_OVERLAY_SWIFT_COMPILE_FLAGS}
5151

52+
DEPLOYMENT_VERSION_OSX ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_OSX}
53+
5254
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
5355
TARGET_SDKS ALL_APPLE_PLATFORMS LINUX WINDOWS
5456
INSTALL_IN_COMPONENT compiler

0 commit comments

Comments
 (0)