Skip to content

Commit d1a435c

Browse files
committed
[build] Respect DEPLOYMENT_VERSION_{IOS|TVOS|WATCHOS} for Simulator targets
This makes sure that Cxx and CxxStdlib modules are built with consistent deployment targets for iOS Simulator and iOS Device. rdar://141232269
1 parent 9bf17e8 commit d1a435c

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

stdlib/cmake/modules/SwiftSource.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,13 +248,13 @@ function(_add_target_variant_swift_compile_flags
248248
if("${sdk}" STREQUAL "OSX" AND DEFINED VARIANT_DEPLOYMENT_VERSION_OSX)
249249
set(sdk_deployment_version ${VARIANT_DEPLOYMENT_VERSION_OSX})
250250
endif()
251-
if("${sdk}" STREQUAL "IOS" AND DEFINED VARIANT_DEPLOYMENT_VERSION_IOS)
251+
if(("${sdk}" STREQUAL "IOS" OR "${sdk}" STREQUAL "IOS_SIMULATOR") AND DEFINED VARIANT_DEPLOYMENT_VERSION_IOS)
252252
set(sdk_deployment_version ${VARIANT_DEPLOYMENT_VERSION_IOS})
253253
endif()
254-
if("${sdk}" STREQUAL "TVOS" AND DEFINED VARIANT_DEPLOYMENT_VERSION_TVOS)
254+
if(("${sdk}" STREQUAL "TVOS" OR "${sdk}" STREQUAL "TVOS_SIMULATOR") AND DEFINED VARIANT_DEPLOYMENT_VERSION_TVOS)
255255
set(sdk_deployment_version ${VARIANT_DEPLOYMENT_VERSION_TVOS})
256256
endif()
257-
if("${sdk}" STREQUAL "WATCHOS" AND DEFINED VARIANT_DEPLOYMENT_VERSION_WATCHOS)
257+
if(("${sdk}" STREQUAL "WATCHOS" OR "${sdk}" STREQUAL "WATCHOS_SIMULATOR") AND DEFINED VARIANT_DEPLOYMENT_VERSION_WATCHOS)
258258
set(sdk_deployment_version ${VARIANT_DEPLOYMENT_VERSION_WATCHOS})
259259
endif()
260260

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// RUN: %swift -c %s -cxx-interoperability-mode=default -target arm64-apple-ios7.0-simulator
2+
3+
// REQUIRES: DARWIN_SIMULATOR=ios
4+
5+
import Cxx
6+
7+
public func takesCxxType(_ s: some CxxSequence) {}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// RUN: %swift -c %s -cxx-interoperability-mode=default -target arm64-apple-ios7.0
2+
3+
// REQUIRES: OS=ios
4+
5+
import Cxx
6+
7+
public func takesCxxType(_ s: some CxxSequence) {}

0 commit comments

Comments
 (0)