From 1e32c450e44fffcac81325f7f56f4dbc34dc0fe7 Mon Sep 17 00:00:00 2001 From: Michael Chiu Date: Mon, 27 Jan 2025 15:12:43 -0800 Subject: [PATCH 1/2] Fix amd64 support --- cmake/modules/SwiftSupport.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/modules/SwiftSupport.cmake b/cmake/modules/SwiftSupport.cmake index 21e455a7f..5825a6574 100644 --- a/cmake/modules/SwiftSupport.cmake +++ b/cmake/modules/SwiftSupport.cmake @@ -36,7 +36,7 @@ function(get_swift_host_arch result_var_name) elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7-a") set("${result_var_name}" "armv7" PARENT_SCOPE) elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "amd64") - set("${result_var_name}" "amd64" PARENT_SCOPE) + set("${result_var_name}" "x86_64" PARENT_SCOPE) elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64") set("${result_var_name}" "x86_64" PARENT_SCOPE) elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "IA64") From 40adeb7fd7e86a3d84779a2c43c2211ae805b804 Mon Sep 17 00:00:00 2001 From: Michael Chiu Date: Mon, 27 Jan 2025 15:13:00 -0800 Subject: [PATCH 2/2] shouldnot install .swiftdoc as .swiftmodule --- Sources/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt index ad39dd9be..f90101e60 100644 --- a/Sources/CMakeLists.txt +++ b/Sources/CMakeLists.txt @@ -42,7 +42,7 @@ if(COLLECTIONS_SINGLE_MODULE) endif() get_swift_host_arch(swift_arch) install(FILES $/${COLLECTIONS_MODULE_NAME}.swiftdoc - DESTINATION lib/${swift}/${swift_os}/${COLLECTIONS_MODULE_NAME}.swiftmodule + DESTINATION lib/${swift}/${swift_os}/${COLLECTIONS_MODULE_NAME}.swiftdoc RENAME ${swift_arch}.swiftdoc) install(FILES $/${COLLECTIONS_MODULE_NAME}.swiftmodule DESTINATION lib/${swift}/${swift_os}/${COLLECTIONS_MODULE_NAME}.swiftmodule