Skip to content

Commit cda377c

Browse files
authored
Merge pull request #5100 from modocache/cmake-is-darwin
[cmake] Use is_darwin_sdk over CMAKE_SYSTEM_NAME
2 parents 27fc4b0 + 47bd025 commit cda377c

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

cmake/modules/AddSwift.cmake

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -125,23 +125,22 @@ function(_add_variant_c_compile_link_flags)
125125
list(APPEND result "-fms-compatibility-version=1900")
126126
endif()
127127

128-
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
129-
128+
if(IS_DARWIN)
130129
# Check if there's a specific iOS deployment version needed for this invocation
131130
if("${CFLAGS_SDK}" STREQUAL "IOS" OR "${CFLAGS_SDK}" STREQUAL "IOS_SIMULATOR")
132131
set(DEPLOYMENT_VERSION ${CFLAGS_DEPLOYMENT_VERSION_IOS})
133132
endif()
134-
133+
135134
if("${DEPLOYMENT_VERSION}" STREQUAL "")
136135
set(DEPLOYMENT_VERSION "${SWIFT_SDK_${CFLAGS_SDK}_DEPLOYMENT_VERSION}")
137136
endif()
138-
137+
139138
list(APPEND result
140139
"-arch" "${CFLAGS_ARCH}"
141140
"-F" "${SWIFT_SDK_${CFLAGS_SDK}_PATH}/../../../Developer/Library/Frameworks"
142141
"-m${SWIFT_SDK_${CFLAGS_SDK}_VERSION_MIN_NAME}-version-min=${DEPLOYMENT_VERSION}")
143142
endif()
144-
143+
145144
if(CFLAGS_ANALYZE_CODE_COVERAGE)
146145
list(APPEND result "-fprofile-instr-generate"
147146
"-fcoverage-mapping")
@@ -241,7 +240,8 @@ function(_add_variant_swift_compile_flags
241240
"-target" "${SWIFT_SDK_${sdk}_ARCH_${arch}_TRIPLE}"
242241
"-resource-dir" "${SWIFTLIB_DIR}")
243242

244-
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
243+
is_darwin_based_sdk("${sdk}" IS_DARWIN)
244+
if(IS_DARWIN)
245245
list(APPEND result
246246
"-F" "${SWIFT_SDK_${sdk}_PATH}/../../../Developer/Library/Frameworks")
247247
endif()
@@ -1688,7 +1688,8 @@ function(_add_swift_executable_single name)
16881688
list(APPEND link_flags "-Wl,-no_pie")
16891689
endif()
16901690

1691-
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
1691+
is_darwin_based_sdk("${SWIFTEXE_SINGLE_SDK}" IS_DARWIN)
1692+
if(IS_DARWIN)
16921693
list(APPEND link_flags
16931694
"-Xlinker" "-rpath"
16941695
"-Xlinker" "@executable_path/../lib/swift/${SWIFT_SDK_${SWIFTEXE_SINGLE_SDK}_LIB_SUBDIR}")

0 commit comments

Comments
 (0)