Skip to content

Commit 9b1eccc

Browse files
authored
Merge pull request #35920 from compnerd/target-libdispatch
build: build target libdispatch as necessary
2 parents 37d02a2 + 3b1f01d commit 9b1eccc

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

cmake/modules/Libdispatch.cmake

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,24 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
3434
endif()
3535

3636
set(DISPATCH_SDKS)
37+
38+
# Build the host libdispatch if needed.
3739
if(SWIFT_BUILD_HOST_DISPATCH)
3840
if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
3941
if(NOT "${SWIFT_HOST_VARIANT_SDK}" IN_LIST SWIFT_SDKS)
4042
list(APPEND DISPATCH_SDKS "${SWIFT_HOST_VARIANT_SDK}")
4143
endif()
4244
endif()
43-
44-
foreach(sdk ${SWIFT_SDKS})
45-
if(NOT "${sdk}" IN_LIST SWIFT_APPLE_PLATFORMS)
46-
list(APPEND DISPATCH_SDKS "${sdk}")
47-
endif()
48-
endforeach()
4945
endif()
5046

47+
# Build any target libdispatch if needed.
48+
foreach(sdk ${SWIFT_SDKS})
49+
# Apple targets have libdispatch available, do not build it.
50+
if(NOT "${sdk}" IN_LIST SWIFT_APPLE_PLATFORMS)
51+
list(APPEND DISPATCH_SDKS "${sdk}")
52+
endif()
53+
endforeach()
54+
5155
foreach(sdk ${DISPATCH_SDKS})
5256
set(ARCHS ${SWIFT_SDK_${sdk}_ARCHITECTURES})
5357
if(${sdk} STREQUAL "${SWIFT_HOST_VARIANT_SDK}")

0 commit comments

Comments
 (0)