[CMake] Fixup build for compiler plugin support library

Author: DougGregor

cmake/modules/AddSwift.cmake

@@ -911,6 +911,12 @@ function(add_swift_host_tool executable)
     endif()
   endif()
 
+  if(SWIFT_SWIFT_PARSER)
+  set_property(
+    TARGET ${executable}
+    APPEND PROPERTY INSTALL_RPATH "@executable_path/../lib")
+  endif()
+
   if(ASHT_THINLTO_LD64_ADD_FLTO_CODEGEN_ONLY)
     string(CONCAT lto_codegen_only_link_options
       "$<"

lib/ASTGen/CMakeLists.txt

@@ -68,6 +68,7 @@ if (SWIFT_SWIFT_PARSER)
     $<TARGET_OBJECTS:SwiftSyntax::SwiftCompilerSupport>
 
     swiftAST
+    swift_CompilerPluginSupport
   )
 
   target_include_directories(swiftASTGen PUBLIC

lib/CMakeLists.txt

@@ -17,6 +17,7 @@ list(APPEND LLVM_COMMON_DEPENDS swift-syntax-generated-headers)
 list(APPEND LLVM_COMMON_DEPENDS swift-ast-generated-headers)
 list(APPEND LLVM_COMMON_DEPENDS swift-parse-syntax-generated-headers)
 
+add_subdirectory(CompilerPluginSupport)
 add_subdirectory(APIDigester)
 add_subdirectory(AST)
 add_subdirectory(ASTGen)
@@ -57,4 +58,3 @@ add_subdirectory(SymbolGraphGen)
 add_subdirectory(Syntax)
 add_subdirectory(SyntaxParse)
 add_subdirectory(Threading)
-add_subdirectory(CompilerPluginSupport)

tools/driver/CMakeLists.txt

@@ -6,8 +6,7 @@
 function(add_swift_parser_link_libraries target)
   if(SWIFT_SWIFT_PARSER)
     target_link_libraries(${target}
-                          PRIVATE
-                            swift_CompilerPluginSupport swiftCore)
+                          PRIVATE swiftCore)
   endif()
 endfunction()
 
@@ -68,11 +67,6 @@ target_link_libraries(swift-frontend
                         swiftCompilerModules)
 
 add_swift_parser_link_libraries(swift-frontend)
-if(SWIFT_SWIFT_PARSER)
-  set_property(
-    TARGET swift-frontend
-    APPEND PROPERTY INSTALL_RPATH "@executable_path/../lib")
-endif()
 
 _add_swift_runtime_link_flags(swift-frontend "../../lib" "")