Skip to content

[5.5] Fix autolink mechanism for static libraries on Linux #3134

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ option(NS_CURL_ASSUME_FEATURES_MISSING "Assume that optional libcurl features ar

find_package(dispatch CONFIG REQUIRED)

find_package(ICU COMPONENTS uc i18n REQUIRED)

include(SwiftSupport)
include(GNUInstallDirs)
include(XCTest)
Expand Down
1 change: 0 additions & 1 deletion CoreFoundation/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
else()
find_package(CURL REQUIRED)
endif()
find_package(ICU COMPONENTS uc i18n REQUIRED)
endif()

include(GNUInstallDirs)
Expand Down
24 changes: 24 additions & 0 deletions Sources/Foundation/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,30 @@ set_target_properties(Foundation PROPERTIES
Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/swift
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR}/swift)

if(NOT BUILD_SHARED_LIBS)
# ICU_I18N_LIBRARY is set by find_package(ICU) in the top level CMakeLists.txt
# It's an absolute path to the found library file
get_target_property(icui18n_path ICU::i18n IMPORTED_LOCATION)
get_filename_component(icu_i18n_basename "${icui18n_path}" NAME_WE)
get_filename_component(icu_i18n_dir "${icui18n_path}" DIRECTORY)
string(REPLACE "lib" "" icu_i18n_basename "${icu_i18n_basename}")

target_compile_options(Foundation
PRIVATE
"SHELL:-Xfrontend -public-autolink-library -Xfrontend ${icu_i18n_basename}
-Xfrontend -public-autolink-library -Xfrontend BlocksRuntime")
# ICU libraries are linked by absolute library path in this project,
# but -public-autolink-library forces to resolve library path by
# library search path given by -L, so add a directory of icui18n
# in the search path
target_link_directories(Foundation PUBLIC "${icu_i18n_dir}")

# Merge private dependencies into single static objects archive
set_property(TARGET Foundation PROPERTY STATIC_LIBRARY_OPTIONS
$<TARGET_OBJECTS:CoreFoundation>
$<TARGET_OBJECTS:uuid>)
endif()

if(CMAKE_SYSTEM_NAME STREQUAL Windows)
# NOTE: workaround for CMake which doesn't link in OBJECT libraries properly
add_dependencies(Foundation CoreFoundationResources)
Expand Down
11 changes: 11 additions & 0 deletions Sources/FoundationNetworking/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,17 @@ target_link_libraries(FoundationNetworking
CFURLSessionInterface
PUBLIC
Foundation)

if(NOT BUILD_SHARED_LIBS)
target_compile_options(FoundationNetworking
PRIVATE
"SHELL:-Xfrontend -public-autolink-library -Xfrontend curl")

# Merge private dependencies into single static objects archive
set_property(TARGET FoundationNetworking PROPERTY STATIC_LIBRARY_OPTIONS
$<TARGET_OBJECTS:CFURLSessionInterface>)
endif()

set_target_properties(FoundationNetworking PROPERTIES
INSTALL_RPATH "$ORIGIN"
Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/swift
Expand Down
11 changes: 11 additions & 0 deletions Sources/FoundationXML/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,17 @@ target_link_libraries(FoundationXML
CFXMLInterface
PUBLIC
Foundation)

if(NOT BUILD_SHARED_LIBS)
target_compile_options(FoundationXML
PRIVATE
"SHELL:-Xfrontend -public-autolink-library -Xfrontend xml2")

# Merge private dependencies into single static objects archive
set_property(TARGET FoundationXML PROPERTY STATIC_LIBRARY_OPTIONS
$<TARGET_OBJECTS:CFXMLInterface>)
endif()

set_target_properties(FoundationXML PROPERTIES
INSTALL_RPATH "$ORIGIN"
Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/swift
Expand Down