Skip to content

Commit e8ac449

Browse files
authored
Merge pull request #68411 from compnerd/destination-unknown
build: copy the import libraries to the correct location
2 parents ffbc65c + 409e622 commit e8ac449

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

lib/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,13 @@ if (SWIFT_SWIFT_PARSER)
9898

9999
if(CMAKE_SYSTEM_NAME MATCHES Windows)
100100
foreach(implib ${SWIFT_SYNTAX_IMPORT_LIBRARIES})
101-
add_custom_command(OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/lib/swift/windows/${implib}
101+
add_custom_command(OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/swift/windows/${SWIFT_HOST_VARIANT_ARCH}/${implib}
102102
DEPENDS ${SWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR}/lib/swift/host/${implib}
103-
COMMAND "${CMAKE_COMMAND}" -E copy_if_different ${SWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR}/lib/swift/host/${implib} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/lib/swift/windows/${implib})
103+
COMMAND "${CMAKE_COMMAND}" -E copy_if_different ${SWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR}/lib/swift/host/${implib} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/swift/windows/${SWIFT_HOST_VARIANT_ARCH}/${implib})
104104
add_custom_target(copy_swiftSyntaxLibrary_${implib}
105-
DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/lib/swift/windows/${implib}
105+
DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/swift/windows/${SWIFT_HOST_VARIANT_ARCH}/${implib}
106106
COMMENT "Copying ${implib}")
107-
swift_install_in_component(PROGRAMS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/lib/swift/windows/${implib}
107+
swift_install_in_component(PROGRAMS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/swift/windows/${SWIFT_HOST_VARIANT_ARCH}/${implib}
108108
DESTINATION lib
109109
COMPONENT compiler)
110110
add_dependencies(swiftSyntaxLibraries copy_swiftSyntaxLibrary_${implib})

0 commit comments

Comments
 (0)