Skip to content

Commit 7c4a8e7

Browse files
committed
Fix the install path for the toolchain
https://bugs.swift.org/browse/SR-6084 <rdar://problem/35040697> [SR-6084]: libdispatch missing from Trunk Development snapshots
1 parent 12c9ca8 commit 7c4a8e7

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

dispatch/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ install(FILES
1414
source.h
1515
time.h
1616
DESTINATION
17-
${CMAKE_INSTALL_FULL_INCLUDEDIR}/dispatch)
17+
"${CMAKE_INSTALL_LIBDIR}/swift/dispatch")
1818
if(ENABLE_SWIFT)
1919
get_filename_component(MODULE_MAP module.modulemap REALPATH)
2020
install(FILES
2121
${MODULE_MAP}
2222
DESTINATION
23-
${CMAKE_INSTALL_FULL_INCLUDEDIR}/dispatch)
23+
"${CMAKE_INSTALL_LIBDIR}/swift/dispatch")
2424
endif()
2525

os/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ install(FILES
66
object.h
77
linux_base.h
88
DESTINATION
9-
"${CMAKE_INSTALL_FULL_INCLUDEDIR}/os")
9+
"${CMAKE_INSTALL_LIBDIR}/swift/os")
1010

src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ add_custom_command(TARGET dispatch POST_BUILD
202202
install(TARGETS
203203
dispatch
204204
DESTINATION
205-
"${CMAKE_INSTALL_LIBDIR}")
205+
"${CMAKE_INSTALL_LIBDIR}/swift/${SWIFT_OS}")
206206
if(ENABLE_SWIFT)
207207
install(FILES
208208
${CMAKE_CURRENT_BINARY_DIR}/swift/Dispatch.swiftmodule

0 commit comments

Comments
 (0)