Skip to content

build: Install libraries in an arch sub-folder #889

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 6 commits into from
Aug 20, 2025
Merged

build: Install libraries in an arch sub-folder #889

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e73dc2b
build: Install libraries in an `arch` sub-folder
Steelskin Jul 23, 2025
5301c96
Use the arch value from the compiler
Steelskin Aug 4, 2025
3eff559
Get the platform name from the compiler
Steelskin Aug 5, 2025
a0def02
Use the right variable name
Steelskin Aug 5, 2025
f51e481
Rename `dispatch_Swift_*` to `dispatch_*`
Steelskin Aug 6, 2025
0fcef7d
Add option to install into an arch-subdir
Steelskin Aug 6, 2025
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
Prev Previous commit
Next Next commit
Use the arch value from the compiler
  • Loading branch information
@Steelskin
Steelskin committed Aug 4, 2025
commit 5301c966363ff78ac34191dc46b549bea8c81bda
3 changes: 1 addition & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,9 +315,8 @@ if(ENABLE_SWIFT)
set(SWIFT_SYSTEM_NAME "$<LOWER_CASE:${CMAKE_SYSTEM_NAME}>")
endif()
endif()
get_swift_host_arch(swift_arch)

set(INSTALL_TARGET_DIR "${CMAKE_INSTALL_LIBDIR}/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/${SWIFT_SYSTEM_NAME}/${swift_arch}" CACHE PATH "Path where the libraries will be installed")
set(INSTALL_TARGET_DIR "${CMAKE_INSTALL_LIBDIR}/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/${SWIFT_SYSTEM_NAME}/${dispatch_Swift_ARCH}" CACHE PATH "Path where the libraries will be installed")
set(INSTALL_DISPATCH_HEADERS_DIR "${CMAKE_INSTALL_LIBDIR}/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/dispatch" CACHE PATH "Path where the headers will be installed for libdispatch")
set(INSTALL_BLOCK_HEADERS_DIR "${CMAKE_INSTALL_LIBDIR}/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/Block" CACHE PATH "Path where the headers will be installed for the blocks runtime")
set(INSTALL_OS_HEADERS_DIR "${CMAKE_INSTALL_LIBDIR}/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/os" CACHE PATH "Path where the os/ headers will be installed")
Expand Down
71 changes: 20 additions & 51 deletions cmake/modules/SwiftSupport.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,56 +1,5 @@
include_guard()

# Returns the architecture name in a variable
#
# Usage:
# get_swift_host_arch(result_var_name)
#
# Sets ${result_var_name} with the converted architecture name derived from
# CMAKE_SYSTEM_PROCESSOR or CMAKE_HOST_SYSTEM_PROCESSOR.
function(get_swift_host_arch result_var_name)
if(CMAKE_SYSTEM_PROCESSOR)
set(cmake_arch ${CMAKE_SYSTEM_PROCESSOR})
else()
set(cmake_arch ${CMAKE_HOST_SYSTEM_PROCESSOR})
endif()
if("${cmake_arch}" STREQUAL "x86_64")
set("${result_var_name}" "x86_64" PARENT_SCOPE)
elseif(cmake_arch MATCHES "aarch64|ARM64|arm64")
if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET OR
"${CMAKE_OSX_DEPLOYMENT_TARGET}" STREQUAL "")
set("${result_var_name}" "aarch64" PARENT_SCOPE)
else()
set("${result_var_name}" "arm64" PARENT_SCOPE)
endif()
elseif("${cmake_arch}" STREQUAL "ppc64")
set("${result_var_name}" "powerpc64" PARENT_SCOPE)
elseif("${cmake_arch}" STREQUAL "ppc64le")
set("${result_var_name}" "powerpc64le" PARENT_SCOPE)
elseif("${cmake_arch}" STREQUAL "s390x")
set("${result_var_name}" "s390x" PARENT_SCOPE)
elseif("${cmake_arch}" STREQUAL "armv6l")
set("${result_var_name}" "armv6" PARENT_SCOPE)
elseif("${cmake_arch}" STREQUAL "armv7-a")
set("${result_var_name}" "armv7" PARENT_SCOPE)
elseif("${cmake_arch}" STREQUAL "armv7l")
set("${result_var_name}" "armv7" PARENT_SCOPE)
elseif("${cmake_arch}" STREQUAL "amd64")
set("${result_var_name}" "amd64" PARENT_SCOPE)
elseif("${cmake_arch}" STREQUAL "AMD64")
set("${result_var_name}" "x86_64" PARENT_SCOPE)
elseif("${cmake_arch}" STREQUAL "IA64")
set("${result_var_name}" "itanium" PARENT_SCOPE)
elseif("${cmake_arch}" STREQUAL "x86")
set("${result_var_name}" "i686" PARENT_SCOPE)
elseif("${cmake_arch}" STREQUAL "i686")
set("${result_var_name}" "i686" PARENT_SCOPE)
elseif("${cmake_arch}" STREQUAL "riscv64")
set("${result_var_name}" "riscv64" PARENT_SCOPE)
else()
message(FATAL_ERROR "Unrecognized architecture: ${cmake_arch}")
endif()
endfunction()

if(NOT dispatch_MODULE_TRIPLE)
set(module_triple_command "${CMAKE_Swift_COMPILER}" -print-target-info)
if(CMAKE_Swift_COMPILER_TARGET)
Expand All @@ -65,6 +14,26 @@ if(NOT dispatch_MODULE_TRIPLE)
message(CONFIGURE_LOG "Swift module triple: ${module_triple}")
endif()

if(NOT dispatch_Swift_ARCH)
if(CMAKE_Swift_COMPILER_VERSION VERSION_EQUAL 0.0.0 OR CMAKE_Swift_COMPILER_VERSION VERSION_GREATER_EQUAL 6.2)
# For newer compilers, we can use the -print-target-info command to get the architecture.
set(module_arch_command "${CMAKE_Swift_COMPILER}" -print-target-info)
if(CMAKE_Swift_COMPILER_TARGET)
list(APPEND module_arch_command -target ${CMAKE_Swift_COMPILER_TARGET})
endif()
execute_process(COMMAND ${module_arch_command} OUTPUT_VARIABLE target_info_json)
string(JSON module_arch GET "${target_info_json}" "target" "arch")
else()
# For older compilers, extract the value from `dispatch_MODULE_TRIPLE`.
string(REGEX MATCH "^[^-]+" module_arch "${dispatch_MODULE_TRIPLE}")
endif()

set(dispatch_Swift_ARCH "${module_arch}" CACHE STRING "Arch folder name used to install libraries")
mark_as_advanced(dispatch_Swift_ARCH)

message(CONFIGURE_LOG "Swift arch: ${dispatch_Swift_ARCH}")
endif()

function(install_swift_module target)
get_target_property(module ${target} Swift_MODULE_NAME)
if(NOT module)
Expand Down