Skip to content

Commit 29e8127

Browse files
committed
build: use the architecture directory for Windows resources
Windows does not support fat binaries, so the target specific components should be placed into the architecture subdirectory. Due to the cross-compilation model that swift has, this needs to be added explicitly for now.
1 parent 3faf741 commit 29e8127

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

cmake/modules/AddSwift.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2019,8 +2019,8 @@ function(add_swift_target_library name)
20192019
swift_install_in_component("${SWIFTLIB_INSTALL_IN_COMPONENT}"
20202020
TARGETS ${name}-windows-${SWIFT_PRIMARY_VARIANT_ARCH}
20212021
RUNTIME DESTINATION "bin"
2022-
LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/${resource_dir}/${resource_dir_sdk_subdir}"
2023-
ARCHIVE DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/${resource_dir}/${resource_dir_sdk_subdir}"
2022+
LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/${resource_dir}/${resource_dir_sdk_subdir}/${SWIFT_PRIMARY_VARIANT_ARCH}"
2023+
ARCHIVE DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/${resource_dir}/${resource_dir_sdk_subdir}/${SWIFT_PRIMARY_VARIANT_ARCH}"
20242024
PERMISSIONS ${file_permissions})
20252025
else()
20262026
swift_install_in_component("${SWIFTLIB_INSTALL_IN_COMPONENT}"

0 commit comments

Comments
 (0)