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")
107
107
-DENABLE_SWIFT=YES
108
108
BUILD_BYPRODUCTS
109
109
${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 }
111
111
STEP_TARGETS
112
112
configure
113
113
BUILD_ALWAYS
@@ -144,11 +144,11 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
144
144
IMPORTED_LINK_INTERFACE_LIBRARIES
145
145
swiftCore-${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}-${SWIFT_HOST_VARIANT_ARCH} )
146
146
147
- add_library (BlocksRuntime STATIC IMPORTED )
147
+ add_library (BlocksRuntime SHARED IMPORTED )
148
148
set_target_properties (BlocksRuntime
149
149
PROPERTIES
150
150
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 }
152
152
INTERFACE_INCLUDE_DIRECTORIES
153
153
${SWIFT_PATH_TO_LIBDISPATCH_SOURCE} /src/BlocksRuntime )
154
154
Original file line number Diff line number Diff line change @@ -2955,7 +2955,7 @@ for host in "${ALL_HOSTS[@]}"; do
2955
2955
fi
2956
2956
# If libdispatch is being built, TestFoundation will need access to it
2957
2957
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 ) "
2959
2959
else
2960
2960
LIBDISPATCH_LIB_DIR=" "
2961
2961
fi
You can’t perform that action at this time.
0 commit comments