Skip to content

Commit ce29eca

Browse files
authored
Merge pull request #77930 from swiftlang/egorzhdan/6.0-cxx-ios-deployment-target
🍒[cxx-interop] Lower iOS deployment target for Cxx and CxxStdlib
2 parents fe0ba3b + af3f760 commit ce29eca

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

stdlib/public/Cxx/CMakeLists.txt

+4
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ add_swift_target_library(swiftCxx STATIC NO_LINK_NAME IS_STDLIB IS_SWIFT_ONLY IS
2525
-Xcc -nostdinc++
2626

2727
DEPLOYMENT_VERSION_OSX ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_OSX}
28+
DEPLOYMENT_VERSION_IOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_IOS}
29+
DEPLOYMENT_VERSION_TVOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_TVOS}
30+
DEPLOYMENT_VERSION_WATCHOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_WATCHOS}
31+
DEPLOYMENT_VERSION_XROS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_XROS}
2832

2933
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
3034
DEPENDS ${SWIFT_CXX_DEPS}

stdlib/public/Cxx/std/CMakeLists.txt

+4
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ add_swift_target_library(swiftCxxStdlib STATIC NO_LINK_NAME IS_STDLIB IS_SWIFT_O
5555
${SWIFT_SDK_LINUX_CXX_OVERLAY_SWIFT_COMPILE_FLAGS}
5656

5757
DEPLOYMENT_VERSION_OSX ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_OSX}
58+
DEPLOYMENT_VERSION_IOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_IOS}
59+
DEPLOYMENT_VERSION_TVOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_TVOS}
60+
DEPLOYMENT_VERSION_WATCHOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_WATCHOS}
61+
DEPLOYMENT_VERSION_XROS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_XROS}
5862

5963
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
6064
TARGET_SDKS ALL_APPLE_PLATFORMS LINUX WINDOWS ANDROID

0 commit comments

Comments
 (0)