File tree Expand file tree Collapse file tree 2 files changed +4
-4
lines changed
Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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
You can’t perform that action at this time.
0 commit comments