Skip to content

Commit f5fa89b

Browse files
authored
Merge pull request #31064 from apple/revert-30643-revert-30096-install
Revert "Revert "[SourceKit] don't install libdispatch and libBlocksRuntime twice, outside of Mac/Windows""
2 parents 69f95a2 + 4316e96 commit f5fa89b

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

CMakeLists.txt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,11 +1045,13 @@ if(SWIFT_BUILD_SYNTAXPARSERLIB OR SWIFT_BUILD_SOURCEKIT)
10451045
set(SOURCEKIT_RUNTIME_DIR lib)
10461046
endif()
10471047
add_dependencies(sourcekit-inproc BlocksRuntime dispatch)
1048-
swift_install_in_component(FILES
1049-
$<TARGET_FILE:dispatch>
1050-
$<TARGET_FILE:BlocksRuntime>
1051-
DESTINATION ${SOURCEKIT_RUNTIME_DIR}
1052-
COMPONENT sourcekit-inproc)
1048+
if("${SWIFT_HOST_VARIANT_SDK}" MATCHES "OSX|WINDOWS")
1049+
swift_install_in_component(FILES
1050+
$<TARGET_FILE:dispatch>
1051+
$<TARGET_FILE:BlocksRuntime>
1052+
DESTINATION ${SOURCEKIT_RUNTIME_DIR}
1053+
COMPONENT sourcekit-inproc)
1054+
endif()
10531055
if(SWIFT_HOST_VARIANT_SDK STREQUAL WINDOWS)
10541056
swift_install_in_component(FILES
10551057
$<TARGET_LINKER_FILE:dispatch>

0 commit comments

Comments
 (0)