Skip to content

build: make swift_lib_add_single more amenable to cross-compilation #3068

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

Merged
merged 1 commit into from
Jun 20, 2016
Merged

build: make swift_lib_add_single more amenable to cross-compilation #3068

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
28 changes: 20 additions & 8 deletions cmake/modules/AddSwift.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,13 @@ function(_add_swift_library_single target name)
endif()

if (SWIFT_COMPILER_VERSION)
if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
if ("${SWIFTLIB_SINGLE_SDK}" STREQUAL "OSX" OR
"${SWIFTLIB_SINGLE_SDK}" STREQUAL "IOS" OR
"${SWIFTLIB_SINGLE_SDK}" STREQUAL "IOS_SIMULATOR" OR
"${SWIFTLIB_SINGLE_SDK}" STREQUAL "TVOS" OR
"${SWIFTLIB_SINGLE_SDK}" STREQUAL "TVOS_SIMULATOR" OR
"${SWIFTLIB_SINGLE_SDK}" STREQUAL "WATCHOS" OR
"${SWIFTLIB_SINGLE_SDK}" STREQUAL "WATCHOS_SIMULATOR")
list(APPEND SWIFTLIB_SINGLE_LINK_FLAGS "-Xlinker" "-current_version" "-Xlinker" "${SWIFT_COMPILER_VERSION}" "-Xlinker" "-compatibility_version" "-Xlinker" "1")
endif()
endif()
Expand Down Expand Up @@ -565,8 +571,8 @@ function(_add_swift_library_single target name)
# we add markers for metadata sections in the shared libraries using
# these object files. This wouldn't be necessary if the link was done by
# the swift binary: rdar://problem/19007002
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" OR
"${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
if("${SWIFTLIB_SINGLE_SDK}" STREQUAL "LINUX" OR
"${SWIFTLIB_SINGLE_SDK}" STREQUAL "FREEBSD")

if("${libkind}" STREQUAL "SHARED")
set(arch_subdir "${SWIFTLIB_DIR}/${SWIFTLIB_SINGLE_SUBDIR}")
Expand Down Expand Up @@ -623,8 +629,8 @@ function(_add_swift_library_single target name)

# The section metadata objects are generated sources, and we need to tell CMake
# not to expect to find them prior to their generation.
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" OR
"${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
if("${SWIFTLIB_SINGLE_SDK}" STREQUAL "LINUX" OR
"${SWIFTLIB_SINGLE_SDK}" STREQUAL "FREEBSD")
if("${libkind}" STREQUAL "SHARED")
set_source_files_properties(${SWIFT_SECTIONS_OBJECT_BEGIN} PROPERTIES GENERATED 1)
set_source_files_properties(${SWIFT_SECTIONS_OBJECT_END} PROPERTIES GENERATED 1)
Expand Down Expand Up @@ -661,7 +667,13 @@ function(_add_swift_library_single target name)
endforeach()
endif()

if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
if("${SWIFTLIB_SINGLE_SDK}" STREQUAL "OSX" OR
"${SWIFTLIB_SINGLE_SDK}" STREQUAL "IOS" OR
"${SWIFTLIB_SINGLE_SDK}" STREQUAL "IOS_SIMULATOR" OR
"${SWIFTLIB_SINGLE_SDK}" STREQUAL "TVOS" OR
"${SWIFTLIB_SINGLE_SDK}" STREQUAL "TVOS_SIMULATOR" OR
"${SWIFTLIB_SINGLE_SDK}" STREQUAL "WATCHOS" OR
"${SWIFTLIB_SINGLE_SDK}" STREQUAL "WATCHOS_SIMULATOR")
set(install_name_dir "@rpath")

if(SWIFTLIB_SINGLE_IS_STDLIB)
Expand All @@ -674,11 +686,11 @@ function(_add_swift_library_single target name)
set_target_properties("${target}"
PROPERTIES
INSTALL_NAME_DIR "${install_name_dir}")
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" AND NOT "${SWIFTLIB_SINGLE_SDK}" STREQUAL "ANDROID")
elseif("${SWIFTLIB_SINGLE_SDK}" STREQUAL "LINUX" AND NOT "${SWIFTLIB_SINGLE_SDK}" STREQUAL "ANDROID")
set_target_properties("${target}"
PROPERTIES
INSTALL_RPATH "$ORIGIN:/usr/lib/swift/linux")
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Cygwin")
elseif("${SWIFTLIB_SINGLE_SDK}" STREQUAL "CYGWIN")
set_target_properties("${target}"
PROPERTIES
INSTALL_RPATH "$ORIGIN:/usr/lib/swift/windows")
Expand Down