Skip to content

Build both shared and static libraries when ENABLE_SWIFT is ON #393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Build both shared and static libraries when ENABLE_SWIFT is ON #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ if(ENABLE_SWIFT)
${SWIFT_RUNTIME_LIBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}swiftSwiftOnoneSupport${CMAKE_SHARED_LIBRARY_SUFFIX})

set(INSTALL_TARGET_DIR "${INSTALL_LIBDIR}/swift/${SWIFT_OS}" CACHE PATH "Path where the libraries will be installed")
set(INSTALL_STATIC_TARGET_DIR "${INSTALL_LIBDIR}/swift_static/${SWIFT_OS}" CACHE PATH "Path where the static libraries will be installed")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To be honest, I'm not sure I understand the point of these two cached variables. They are part of the resource dir naming scheme for the compiler, so why not always compose them when used?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am happy to drop them

set(INSTALL_DISPATCH_HEADERS_DIR "${INSTALL_LIBDIR}/swift/dispatch" CACHE PATH "Path where the headers will be installed for libdispatch")
set(INSTALL_BLOCK_HEADERS_DIR "${INSTALL_LIBDIR}/swift/Block" CACHE PATH "Path where the headers will be installed for the blocks runtime")
set(INSTALL_OS_HEADERS_DIR "${INSTALL_LIBDIR}/swift/os" CACHE PATH "Path where the os/ headers will be installed")
Expand Down
171 changes: 118 additions & 53 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,74 @@
include(SwiftSupport)
include(DTrace)

add_library(dispatch
if(ENABLE_SWIFT)
set(dispatch_targets dispatch dispatch_static dispatch_objects)
else()
set(dispatch_targets dispatch)
endif()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2-space indents please

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll fix this up in my next patch


function(dispatch_add_library)
# Swift builds both shared and static libraries
if(ENABLE_SWIFT)
add_library(dispatch_objects OBJECT ${ARGV})
set_property(TARGET dispatch_objects PROPERTY POSITION_INDEPENDENT_CODE ON)
add_library(dispatch SHARED $<TARGET_OBJECTS:dispatch_objects>)
set_target_properties(dispatch PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/swift/${SWIFT_OS}
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/swift/${SWIFT_OS}
)
add_library(dispatch_static STATIC $<TARGET_OBJECTS:dispatch_objects>)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This breaks for windows. Please do a combined build for Windows. We need to build the objects twice, using the same objects will not work.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have a Windows machine to test on, can you elaborate on this? Are object libraries just broken in general? On Linux I could instead create a static library (with -fPIC) and then create a .so out of it with ld --whole-archive but that's not portable. Is there any way I can avoid building the objects twice on platforms where that's not required?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, object libraries are fine, just as long as they are built for the final type (e.g. built with knowledge that they will be used for a shared library or not). The best way to accomplish this is to perform two builds with the right CMake flags so that you build the objects the right way.

set_target_properties(dispatch_static PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/swift_static/${SWIFT_OS}
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/swift_static/${SWIFT_OS}
OUTPUT_NAME dispatch
)
else()
add_library(dispatch ${ARGV})
endif()
endfunction()

function(dispatch_target_sources)
if(ENABLE_SWIFT)
target_sources(dispatch_objects ${ARGV})
else()
target_sources(dispatch ${ARGV})
endif()
endfunction()

function(dispatch_target_include_directories)
foreach(target IN LISTS dispatch_targets)
target_include_directories(${target} ${ARGV})
endforeach()
endfunction()

function(dispatch_target_compile_definitions)
foreach(target IN LISTS dispatch_targets)
target_compile_definitions(${target} ${ARGV})
endforeach()
endfunction()

function(dispatch_target_compile_options)
foreach(target IN LISTS dispatch_targets)
target_compile_options(${target} ${ARGV})
endforeach()
endfunction()

function(dispatch_target_link_libraries)
foreach(target IN LISTS dispatch_targets)
if(NOT target STREQUAL "dispatch_objects")
target_link_libraries(${target} ${ARGV})
endif()
endforeach()
endfunction()

function(dispatch_target_set_property)
foreach(target IN LISTS dispatch_targets)
set_property(TARGET ${target} ${ARGV})
endforeach()
endfunction()

dispatch_add_library(
allocator.c
apply.c
benchmark.c
Expand Down Expand Up @@ -54,27 +121,27 @@ add_library(dispatch
shims/tsd.h
shims/yield.h)
if(UNIX)
target_sources(dispatch
dispatch_target_sources(
PRIVATE
shims/generic_unix_stubs.c
shims/generic_unix_stubs.h)
elseif(WIN32)
target_sources(dispatch
dispatch_target_sources(
PRIVATE
shims/generic_win_stubs.c
shims/generic_win_stubs.h)
endif()
if(DISPATCH_USE_INTERNAL_WORKQUEUE)
target_sources(dispatch
dispatch_target_sources(
PRIVATE
event/workqueue.c
event/workqueue_internal.h)
endif()
target_sources(dispatch
dispatch_target_sources(
PRIVATE
block.cpp)
if(HAVE_OBJC)
target_sources(dispatch
dispatch_target_sources(dispatch
PRIVATE
data.m
object.m)
Expand Down Expand Up @@ -114,126 +181,120 @@ if(ENABLE_SWIFT)
${swift_optimization_flags}
DEPENDS
${CMAKE_SOURCE_DIR}/dispatch/module.modulemap)
target_sources(dispatch
dispatch_target_sources(
PRIVATE
swift/DispatchStubs.cc
${CMAKE_CURRENT_BINARY_DIR}/swiftDispatch.o)
swift/DispatchStubs.cc)
foreach(target dispatch dispatch_static)
add_dependencies(${target} swiftDispatch)
target_sources(${target} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/swiftDispatch.o)
endforeach()
endif()
if(ENABLE_DTRACE)
dtrace_usdt_probe(${CMAKE_CURRENT_SOURCE_DIR}/provider.d
OUTPUT_SOURCES
dispatch_dtrace_provider_headers)
target_sources(dispatch
dispatch_target_sources(
PRIVATE
${dispatch_dtrace_provider_headers})
endif()
target_include_directories(dispatch
dispatch_target_include_directories(
PRIVATE
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/private)
if(WITH_BLOCKS_RUNTIME)
target_include_directories(dispatch
dispatch_target_include_directories(
SYSTEM BEFORE PRIVATE
"${WITH_BLOCKS_RUNTIME}")
endif()
if(WIN32)
target_compile_definitions(dispatch
dispatch_target_compile_definitions(
PRIVATE
_CRT_NONSTDC_NO_WARNINGS)
endif()
if("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC")
target_compile_options(dispatch PRIVATE /EHsc-)
dispatch_target_compile_options(PRIVATE /EHsc-)
else()
target_compile_options(dispatch PRIVATE -fno-exceptions)
dispatch_target_compile_options(PRIVATE -fno-exceptions)
endif()
if(DISPATCH_ENABLE_ASSERTS)
target_compile_definitions(dispatch
dispatch_target_compile_definitions(
PRIVATE
-DDISPATCH_DEBUG=1)
DISPATCH_DEBUG=1)
endif()
if(CMAKE_SYSTEM_NAME STREQUAL Windows)
target_compile_definitions(dispatch
dispatch_target_compile_definitions(
PRIVATE
-D_CRT_SECURE_NO_WARNINGS)
_CRT_SECURE_NO_WARNINGS)
elseif(CMAKE_SYSTEM_NAME STREQUAL Android)
target_compile_options(dispatch
dispatch_target_compile_options(
PRIVATE
-U_GNU_SOURCE)
endif()
if(BSD_OVERLAY_FOUND)
target_compile_options(dispatch
dispatch_target_compile_options(
PRIVATE
${BSD_OVERLAY_CFLAGS})
endif()
if("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC")
target_compile_options(dispatch
dispatch_target_compile_options(
PRIVATE
/W3)
else()
target_compile_options(dispatch
dispatch_target_compile_options(
PRIVATE
-Wall)
endif()
# FIXME(compnerd) add check for -fblocks?
if("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC")
target_compile_options(dispatch
dispatch_target_compile_options(
PRIVATE
-Xclang -fblocks)
else()
# FIXME(compnerd) add check for -momit-leaf-frame-pointer?
target_compile_options(dispatch
dispatch_target_compile_options(
PRIVATE
-fblocks
-momit-leaf-frame-pointer)
endif()
if(BSD_OVERLAY_FOUND)
target_link_libraries(dispatch PRIVATE ${BSD_OVERLAY_LDFLAGS})
dispatch_target_link_libraries(PRIVATE ${BSD_OVERLAY_LDFLAGS})
endif()
target_link_libraries(dispatch PRIVATE Threads::Threads)
dispatch_target_link_libraries(PRIVATE Threads::Threads)
if(WITH_BLOCKS_RUNTIME)
target_link_libraries(dispatch PRIVATE BlocksRuntime)
dispatch_target_link_libraries(PRIVATE BlocksRuntime)
endif()
if(CMAKE_SYSTEM_NAME STREQUAL Windows)
target_link_libraries(dispatch
dispatch_target_link_libraries(
PRIVATE
WS2_32
WinMM
synchronization)
endif()
if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
set_property(TARGET dispatch
APPEND_STRING
PROPERTY LINK_FLAGS
"-Xlinker -compatibility_version -Xlinker 1"
"-Xlinker -current_version -Xlinker ${VERSION}"
"-Xlinker -dead_strip"
"-Xlinker -alias_list -Xlinker ${CMAKE_SOURCE_DIR}/xcodeconfig/libdispatch.aliases")
dispatch_target_set_property(
APPEND_STRING
PROPERTY LINK_FLAGS
"-Xlinker -compatibility_version -Xlinker 1"
"-Xlinker -current_version -Xlinker ${VERSION}"
"-Xlinker -dead_strip"
"-Xlinker -alias_list -Xlinker ${CMAKE_SOURCE_DIR}/xcodeconfig/libdispatch.aliases")
endif()
if(USE_GOLD_LINKER)
set_property(TARGET dispatch
APPEND_STRING
PROPERTY LINK_FLAGS
-fuse-ld=gold)
dispatch_target_set_property(
APPEND_STRING
PROPERTY LINK_FLAGS
-fuse-ld=gold)
endif()
if(USE_LLD_LINKER)
set_property(TARGET dispatch
APPEND_STRING
PROPERTY LINK_FLAGS
-fuse-ld=lld)
dispatch_target_set_property(
APPEND_STRING
PROPERTY LINK_FLAGS
-fuse-ld=lld)
endif()

# Temporary staging; the various swift projects that depend on libdispatch
# all expect libdispatch.so to be in src/.libs/libdispatch.so
# So for now, make a copy so we don't have to do a coordinated commit across
# all the swift projects to change this assumption.
add_custom_command(TARGET dispatch POST_BUILD
COMMAND cmake -E make_directory .libs
COMMAND cmake -E copy $<TARGET_FILE:dispatch> .libs
COMMENT "Copying libdispatch to .libs")

install(TARGETS
dispatch
DESTINATION
Expand All @@ -244,5 +305,9 @@ if(ENABLE_SWIFT)
${CMAKE_CURRENT_BINARY_DIR}/swift/Dispatch.swiftdoc
DESTINATION
"${INSTALL_TARGET_DIR}/${CMAKE_SYSTEM_PROCESSOR}")
install(TARGETS
dispatch_static
DESTINATION
"${INSTALL_STATIC_TARGET_DIR}")
endif()