Skip to content

Commit 4c470de

Browse files
committed
SourceKit: use shared blocksruntime
Switch libdispatch to shared BlocksRuntime. Update the dependency here accordingly.
1 parent 625ba7b commit 4c470de

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

tools/SourceKit/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
107107
-DENABLE_SWIFT=YES
108108
BUILD_BYPRODUCTS
109109
${SWIFT_PATH_TO_LIBDISPATCH_BUILD}/src/${CMAKE_SHARED_LIBRARY_PREFIX}dispatch${CMAKE_SHARED_LIBRARY_SUFFIX}
110-
${SWIFT_PATH_TO_LIBDISPATCH_BUILD}/${CMAKE_STATIC_LIBRARY_PREFIX}BlocksRuntime${CMAKE_STATIC_LIBRARY_SUFFIX}
110+
${SWIFT_PATH_TO_LIBDISPATCH_BUILD}/${CMAKE_SHARED_LIBRARY_PREFIX}BlocksRuntime${CMAKE_SHARED_LIBRARY_SUFFIX}
111111
STEP_TARGETS
112112
configure
113113
BUILD_ALWAYS
@@ -144,11 +144,11 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
144144
IMPORTED_LINK_INTERFACE_LIBRARIES
145145
swiftCore-${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}-${SWIFT_HOST_VARIANT_ARCH})
146146

147-
add_library(BlocksRuntime STATIC IMPORTED)
147+
add_library(BlocksRuntime SHARED IMPORTED)
148148
set_target_properties(BlocksRuntime
149149
PROPERTIES
150150
IMPORTED_LOCATION
151-
${SWIFT_PATH_TO_LIBDISPATCH_BUILD}/${CMAKE_STATIC_LIBRARY_PREFIX}BlocksRuntime${CMAKE_STATIC_LIBRARY_SUFFIX}
151+
${SWIFT_PATH_TO_LIBDISPATCH_BUILD}/${CMAKE_SHARED_LIBRARY_PREFIX}BlocksRuntime${CMAKE_SHARED_LIBRARY_SUFFIX}
152152
INTERFACE_INCLUDE_DIRECTORIES
153153
${SWIFT_PATH_TO_LIBDISPATCH_SOURCE}/src/BlocksRuntime)
154154

utils/build-script-impl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2955,7 +2955,7 @@ for host in "${ALL_HOSTS[@]}"; do
29552955
fi
29562956
# If libdispatch is being built, TestFoundation will need access to it
29572957
if [[ ! "${SKIP_BUILD_LIBDISPATCH}" ]] ; then
2958-
LIBDISPATCH_LIB_DIR=":$(build_directory ${host} libdispatch)/src/.libs"
2958+
LIBDISPATCH_LIB_DIR=":$(build_directory ${host} libdispatch)/src/.libs:$(build_directory ${host} libdispatch)"
29592959
else
29602960
LIBDISPATCH_LIB_DIR=""
29612961
fi

0 commit comments

Comments
 (0)