Start building libswift_CompilerPluginSupport into lib/swift/host.

Author: DougGregor

cmake/modules/AddSwift.cmake

@@ -914,7 +914,7 @@ function(add_swift_host_tool executable)
   if(SWIFT_SWIFT_PARSER)
     set_property(
       TARGET ${executable}
-      APPEND PROPERTY INSTALL_RPATH "@executable_path/../lib")
+      APPEND PROPERTY INSTALL_RPATH "@executable_path/../lib/swift/host")
   endif()
 
   if(ASHT_THINLTO_LD64_ADD_FLTO_CODEGEN_ONLY)

lib/CompilerPluginSupport/CMakeLists.txt

@@ -18,6 +18,12 @@ if(SWIFT_SWIFT_PARSER)
   add_library("${library_name}" SHARED
     CompilerPluginSupport.swift)
 
+  set_target_properties(${library_name}
+    PROPERTIES
+      ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/swift/host"
+      LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/swift/host"
+  )
+
   if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)
     set(DEPLOYMENT_VERSION "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_DEPLOYMENT_VERSION}")
   endif()
@@ -28,7 +34,7 @@ if(SWIFT_SWIFT_PARSER)
 
   # Determine the Swift module path
   set(module_triple ${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_ARCH_${SWIFT_HOST_VARIANT_ARCH}_MODULE})
-  set(module_dir "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
+  set(module_dir "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/swift/host")
   set(module_base "${module_dir}/${module_name}.swiftmodule")
   set(module_file "${module_base}/${module_triple}.swiftmodule")
   set(module_interface_file "${module_base}/${module_triple}.swiftinterface")
@@ -82,17 +88,17 @@ if(SWIFT_SWIFT_PARSER)
       DESTINATION "bin"
       COMPONENT compiler
     FRAMEWORK
-      DESTINATION "lib${LLVM_LIBDIR_SUFFIX}"
+      DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/host"
       COMPONENT compiler
     LIBRARY
-      DESTINATION "lib${LLVM_LIBDIR_SUFFIX}"
+      DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/host"
       COMPONENT compiler
     ARCHIVE
-      DESTINATION "lib${LLVM_LIBDIR_SUFFIX}"
+      DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/host"
       COMPONENT compiler)
 
     swift_install_in_component(DIRECTORY "${module_base}"
-                               DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift"
+                               DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/host"
                                COMPONENT compiler)
 
     set_property(GLOBAL APPEND PROPERTY SWIFT_EXPORTS ${library_name})

tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake

@@ -431,7 +431,7 @@ macro(add_sourcekit_framework name)
     set(RPATH_LIST)
     add_sourcekit_swift_runtime_link_flags(${name} "${SOURCEKIT_LIBRARY_OUTPUT_INTDIR}" ${SOURCEKITFW_HAS_SWIFT_MODULES})
     file(RELATIVE_PATH relative_lib_path
-      "${framework_location}/Versions/A" "${SOURCEKIT_LIBRARY_OUTPUT_INTDIR}")
+      "${framework_location}/Versions/A" "${SOURCEKIT_LIBRARY_OUTPUT_INTDIR}/swift/host")
     list(APPEND RPATH_LIST "@loader_path/${relative_lib_path}")
 
     set_target_properties(${name} PROPERTIES
@@ -466,7 +466,7 @@ macro(add_sourcekit_framework name)
     set(RPATH_LIST)
     add_sourcekit_swift_runtime_link_flags(${name} "${framework_location}" SOURCEKITFW_HAS_SWIFT_MODULES RPATH_LIST)
     file(RELATIVE_PATH relative_lib_path
-      "${framework_location}" "${SOURCEKIT_LIBRARY_OUTPUT_INTDIR}")
+      "${framework_location}" "${SOURCEKIT_LIBRARY_OUTPUT_INTDIR}/swift/host")
     list(APPEND RPATH_LIST "@loader_path/${relative_lib_path}")
 
     set_target_properties(${name} PROPERTIES
@@ -555,7 +555,7 @@ macro(add_sourcekit_xpc_service name framework_target)
   set(RPATH_LIST)
   add_sourcekit_swift_runtime_link_flags(${name} ${xpc_bin_dir} ${SOURCEKITXPC_HAS_SWIFT_MODULES})
 
-  file(RELATIVE_PATH relative_lib_path "${xpc_bin_dir}" "${lib_dir}")
+  file(RELATIVE_PATH relative_lib_path "${xpc_bin_dir}" "${lib_dir}/swift/host")
   list(APPEND RPATH_LIST "@loader_path/${relative_lib_path}")
 
   # Add rpath for sourcekitdInProc