Skip to content

Commit 925835f

Browse files
authored
NFC: Use SWIFT_APPLE_PLATFORMS and remove is_darwin_based_sdk
1 parent 84a21d1 commit 925835f

File tree

2 files changed

+4
-20
lines changed

2 files changed

+4
-20
lines changed

stdlib/cmake/modules/AddSwiftStdlib.cmake

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,6 @@
22
include(AddSwift)
33
include(SwiftSource)
44

5-
function(is_darwin_based_sdk sdk_name out_var)
6-
if ("${sdk_name}" STREQUAL "OSX" OR
7-
"${sdk_name}" STREQUAL "IOS" OR
8-
"${sdk_name}" STREQUAL "IOS_SIMULATOR" OR
9-
"${sdk_name}" STREQUAL "TVOS" OR
10-
"${sdk_name}" STREQUAL "TVOS_SIMULATOR" OR
11-
"${sdk_name}" STREQUAL "WATCHOS" OR
12-
"${sdk_name}" STREQUAL "WATCHOS_SIMULATOR")
13-
set(${out_var} TRUE PARENT_SCOPE)
14-
else()
15-
set(${out_var} FALSE PARENT_SCOPE)
16-
endif()
17-
endfunction()
18-
195
function(add_dependencies_multiple_targets)
206
cmake_parse_arguments(
217
ADMT # prefix
@@ -63,8 +49,7 @@ function(_add_target_variant_c_compile_link_flags)
6349

6450
set(result ${${CFLAGS_RESULT_VAR_NAME}})
6551

66-
is_darwin_based_sdk("${CFLAGS_SDK}" IS_DARWIN)
67-
if(IS_DARWIN)
52+
if("${CFLAGS_SDK}" IN_LIST SWIFT_APPLE_PLATFORMS)
6853
# Check if there's a specific OS deployment version needed for this invocation
6954
if("${CFLAGS_SDK}" STREQUAL "OSX")
7055
if(DEFINED maccatalyst_build_flavor)
@@ -113,7 +98,7 @@ function(_add_target_variant_c_compile_link_flags)
11398
endif()
11499
endif()
115100

116-
if(IS_DARWIN)
101+
if("${CFLAGS_SDK}" IN_LIST SWIFT_APPLE_PLATFORMS)
117102
# We collate -F with the framework path to avoid unwanted deduplication
118103
# of options by target_compile_options -- this way no undesired
119104
# side effects are introduced should a new search path be added.

stdlib/cmake/modules/SwiftSource.cmake

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,7 @@ function(_add_target_variant_swift_compile_flags
210210
list(APPEND result "-sdk" "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}")
211211
endif()
212212

213-
is_darwin_based_sdk("${sdk}" IS_DARWIN)
214-
if(IS_DARWIN)
213+
if("${sdk}" IN_LIST SWIFT_APPLE_PLATFORMS)
215214
set(sdk_deployment_version "${SWIFT_SDK_${sdk}_DEPLOYMENT_VERSION}")
216215
get_target_triple(target target_variant "${sdk}" "${arch}"
217216
MACCATALYST_BUILD_FLAVOR "${VARIANT_MACCATALYST_BUILD_FLAVOR}"
@@ -237,7 +236,7 @@ function(_add_target_variant_swift_compile_flags
237236
list(APPEND result "-resource-dir" "${SWIFTLIB_DIR}")
238237
endif()
239238

240-
if(IS_DARWIN)
239+
if("${sdk}" IN_LIST SWIFT_APPLE_PLATFORMS)
241240
# We collate -F with the framework path to avoid unwanted deduplication
242241
# of options by target_compile_options -- this way no undesired
243242
# side effects are introduced should a new search path be added.

0 commit comments

Comments
 (0)