From 7c4a8e7e733d7968cee20a4db857a538a7140724 Mon Sep 17 00:00:00 2001
From: Ankit Aggarwal <ankit_aggarwal@apple.com>
Date: Wed, 18 Oct 2017 23:55:18 +0000
Subject: [PATCH] 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
---
 dispatch/CMakeLists.txt | 4 ++--
 os/CMakeLists.txt       | 2 +-
 src/CMakeLists.txt      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dispatch/CMakeLists.txt b/dispatch/CMakeLists.txt
index b50b1ba15..c13cfd862 100644
--- a/dispatch/CMakeLists.txt
+++ b/dispatch/CMakeLists.txt
@@ -14,12 +14,12 @@ install(FILES
           source.h
           time.h
         DESTINATION
-          ${CMAKE_INSTALL_FULL_INCLUDEDIR}/dispatch)
+          "${CMAKE_INSTALL_LIBDIR}/swift/dispatch")
 if(ENABLE_SWIFT)
   get_filename_component(MODULE_MAP module.modulemap REALPATH)
   install(FILES
             ${MODULE_MAP}
           DESTINATION
-            ${CMAKE_INSTALL_FULL_INCLUDEDIR}/dispatch)
+            "${CMAKE_INSTALL_LIBDIR}/swift/dispatch")
 endif()
 
diff --git a/os/CMakeLists.txt b/os/CMakeLists.txt
index 6e2b41518..bd26097f1 100644
--- a/os/CMakeLists.txt
+++ b/os/CMakeLists.txt
@@ -6,5 +6,5 @@ install(FILES
           object.h
           linux_base.h
         DESTINATION
-          "${CMAKE_INSTALL_FULL_INCLUDEDIR}/os")
+          "${CMAKE_INSTALL_LIBDIR}/swift/os")
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4d4bb2e55..2d937a423 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -202,7 +202,7 @@ add_custom_command(TARGET dispatch POST_BUILD
 install(TARGETS
           dispatch
         DESTINATION
-          "${CMAKE_INSTALL_LIBDIR}")
+          "${CMAKE_INSTALL_LIBDIR}/swift/${SWIFT_OS}")
 if(ENABLE_SWIFT)
   install(FILES
             ${CMAKE_CURRENT_BINARY_DIR}/swift/Dispatch.swiftmodule