[lldb/cmake] Implicitly pass arguments to llvm_add_library (#142583)

If we're not touching them, we don't need to do anything special to pass
them along -- with one important caveat: due to how cmake arguments
work, the implicitly passed arguments need to be specified before
arguments that we handle.

This isn't particularly nice, but the alternative is enumerating all
arguments that can be used by llvm_add_library and the macros it calls
(it also relies on implicit passing of some arguments to
llvm_process_sources).

93 files changed, 251 insertions, 272 deletions

diff --git a/lldb/source/API/CMakeLists.txt b/lldb/source/API/CMakeLists.txt
index 4139f8a..fbf4e5c 100644
--- a/lldb/source/API/CMakeLists.txt
+++ b/lldb/source/API/CMakeLists.txt
@@ -128,6 +128,8 @@ add_lldb_library(liblldb SHARED ${option_framework}
   DEPENDS
     lldb-sbapi-dwarf-enums
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbBreakpoint
     lldbCore
@@ -142,8 +144,6 @@ add_lldb_library(liblldb SHARED ${option_framework}
     lldbValueObject
     lldbVersion
     ${LLDB_ALL_PLUGINS}
-  LINK_COMPONENTS
-    Support
 
   ${option_install_prefix}
 )
diff --git a/lldb/source/Breakpoint/CMakeLists.txt b/lldb/source/Breakpoint/CMakeLists.txt
index 6cd3c39..d8f8f8c 100644
--- a/lldb/source/Breakpoint/CMakeLists.txt
+++ b/lldb/source/Breakpoint/CMakeLists.txt
@@ -26,6 +26,8 @@ add_lldb_library(lldbBreakpoint NO_PLUGIN_DEPENDENCIES
   WatchpointOptions.cpp
   WatchpointResource.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbCore
     lldbExpression
@@ -34,7 +36,4 @@ add_lldb_library(lldbBreakpoint NO_PLUGIN_DEPENDENCIES
     lldbTarget
     lldbUtility
     lldbValueObject
-
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Commands/CMakeLists.txt b/lldb/source/Commands/CMakeLists.txt
index 71339cc..1ea51ac 100644
--- a/lldb/source/Commands/CMakeLists.txt
+++ b/lldb/source/Commands/CMakeLists.txt
@@ -43,6 +43,8 @@ add_lldb_library(lldbCommands NO_PLUGIN_DEPENDENCIES
   CommandOptionsProcessAttach.cpp
   CommandOptionsProcessLaunch.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbBreakpoint
     lldbCore
@@ -55,9 +57,6 @@ add_lldb_library(lldbCommands NO_PLUGIN_DEPENDENCIES
     lldbUtility
     lldbValueObject
     lldbVersion
-
-  LINK_COMPONENTS
-    Support
   )
 
 add_dependencies(lldbCommands LLDBOptionsGen)
diff --git a/lldb/source/Core/CMakeLists.txt b/lldb/source/Core/CMakeLists.txt
index c4c442d..53dc031 100644
--- a/lldb/source/Core/CMakeLists.txt
+++ b/lldb/source/Core/CMakeLists.txt
@@ -60,6 +60,12 @@ add_lldb_library(lldbCore NO_PLUGIN_DEPENDENCIES
   DEPENDS
     clang-tablegen-targets
 
+
+  LINK_COMPONENTS
+    Support
+    Demangle
+    TargetParser
+    Telemetry
   LINK_LIBS
     lldbBreakpoint
     lldbDataFormatters
@@ -75,12 +81,6 @@ add_lldb_library(lldbCore NO_PLUGIN_DEPENDENCIES
 
   CLANG_LIBS
     clangDriver
-
-  LINK_COMPONENTS
-    Support
-    Demangle
-    TargetParser
-    Telemetry
   )
 
 add_dependencies(lldbCore
diff --git a/lldb/source/DataFormatters/CMakeLists.txt b/lldb/source/DataFormatters/CMakeLists.txt
index 91b10ba..097cbdb 100644
--- a/lldb/source/DataFormatters/CMakeLists.txt
+++ b/lldb/source/DataFormatters/CMakeLists.txt
@@ -18,6 +18,8 @@ add_lldb_library(lldbDataFormatters NO_PLUGIN_DEPENDENCIES
   ValueObjectPrinter.cpp
   VectorType.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbCore
     lldbInterpreter
@@ -25,7 +27,4 @@ add_lldb_library(lldbDataFormatters NO_PLUGIN_DEPENDENCIES
     lldbTarget
     lldbUtility
     lldbValueObject
-
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Expression/CMakeLists.txt b/lldb/source/Expression/CMakeLists.txt
index 9e1c3419..ac129ce 100644
--- a/lldb/source/Expression/CMakeLists.txt
+++ b/lldb/source/Expression/CMakeLists.txt
@@ -20,6 +20,10 @@ add_lldb_library(lldbExpression NO_PLUGIN_DEPENDENCIES
   DEPENDS
   intrinsics_gen
 
+  LINK_COMPONENTS
+    Core
+    ExecutionEngine
+    Support
   LINK_LIBS
     lldbCore
     lldbHost
@@ -28,9 +32,4 @@ add_lldb_library(lldbExpression NO_PLUGIN_DEPENDENCIES
     lldbTarget
     lldbUtility
     lldbValueObject
-
-  LINK_COMPONENTS
-    Core
-    ExecutionEngine
-    Support
   )
diff --git a/lldb/source/Host/CMakeLists.txt b/lldb/source/Host/CMakeLists.txt
index d19e4ed..21f4a89 100644
--- a/lldb/source/Host/CMakeLists.txt
+++ b/lldb/source/Host/CMakeLists.txt
@@ -177,14 +177,13 @@ endif()
 add_lldb_library(lldbHost NO_PLUGIN_DEPENDENCIES
   ${HOST_SOURCES}
 
+  LINK_COMPONENTS
+    Object
+    Support
   LINK_LIBS
     lldbUtility
     ${EXTRA_LIBS}
     ${LLDBObjCLibs}
     ${LLDB_LIBEDIT_LIBS}
-
-  LINK_COMPONENTS
-    Object
-    Support
   )
 
diff --git a/lldb/source/Host/macosx/objcxx/CMakeLists.txt b/lldb/source/Host/macosx/objcxx/CMakeLists.txt
index cda8269..a55fc22 100644
--- a/lldb/source/Host/macosx/objcxx/CMakeLists.txt
+++ b/lldb/source/Host/macosx/objcxx/CMakeLists.txt
@@ -8,13 +8,12 @@ add_lldb_library(lldbHostMacOSXObjCXX NO_PLUGIN_DEPENDENCIES
   HostThreadMacOSX.mm
   MemoryMonitorMacOSX.mm
 
-  LINK_LIBS
-    lldbUtility
-    ${EXTRA_LIBS}
-
   LINK_COMPONENTS
     Support
     TargetParser
+  LINK_LIBS
+    lldbUtility
+    ${EXTRA_LIBS}
   )
 
 target_compile_options(lldbHostMacOSXObjCXX PRIVATE
diff --git a/lldb/source/Initialization/CMakeLists.txt b/lldb/source/Initialization/CMakeLists.txt
index b6282e1..9b81fac 100644
--- a/lldb/source/Initialization/CMakeLists.txt
+++ b/lldb/source/Initialization/CMakeLists.txt
@@ -11,12 +11,12 @@ add_lldb_library(lldbInitialization
   SystemInitializer.cpp
   SystemLifetimeManager.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbCore
     lldbHost
     lldbPluginProcessGDBRemote
     ${EXTRA_PLUGINS}
     ${LLDB_SYSTEM_LIBS}
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Interpreter/CMakeLists.txt b/lldb/source/Interpreter/CMakeLists.txt
index 642263a..99e8ec7 100644
--- a/lldb/source/Interpreter/CMakeLists.txt
+++ b/lldb/source/Interpreter/CMakeLists.txt
@@ -55,6 +55,8 @@ add_lldb_library(lldbInterpreter NO_PLUGIN_DEPENDENCIES
   Property.cpp
   ScriptInterpreter.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbInterpreterInterfaces
     lldbCommands
@@ -63,9 +65,6 @@ add_lldb_library(lldbInterpreter NO_PLUGIN_DEPENDENCIES
     lldbHost
     lldbTarget
     lldbUtility
-
-  LINK_COMPONENTS
-    Support
   )
 
 add_dependencies(lldbInterpreter
diff --git a/lldb/source/Interpreter/Interfaces/CMakeLists.txt b/lldb/source/Interpreter/Interfaces/CMakeLists.txt
index f44672a..8b04398 100644
--- a/lldb/source/Interpreter/Interfaces/CMakeLists.txt
+++ b/lldb/source/Interpreter/Interfaces/CMakeLists.txt
@@ -1,10 +1,9 @@
 add_lldb_library(lldbInterpreterInterfaces NO_PLUGIN_DEPENDENCIES
   ScriptedInterfaceUsages.cpp
 
-  LINK_LIBS
-    lldbUtility
-
   LINK_COMPONENTS
     Support
+  LINK_LIBS
+    lldbUtility
   )
 
diff --git a/lldb/source/Plugins/ABI/AArch64/CMakeLists.txt b/lldb/source/Plugins/ABI/AArch64/CMakeLists.txt
index e1e5552..f3bc7bc 100644
--- a/lldb/source/Plugins/ABI/AArch64/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/AArch64/CMakeLists.txt
@@ -3,12 +3,12 @@ add_lldb_library(lldbPluginABIAArch64 PLUGIN
   ABIMacOSX_arm64.cpp
   ABISysV_arm64.cpp
 
+  LINK_COMPONENTS
+    Support
+    TargetParser
   LINK_LIBS
     lldbCore
     lldbSymbol
     lldbTarget
     lldbValueObject
-  LINK_COMPONENTS
-    Support
-    TargetParser
   )
diff --git a/lldb/source/Plugins/ABI/ARC/CMakeLists.txt b/lldb/source/Plugins/ABI/ARC/CMakeLists.txt
index 8654461..bcaa3ff 100644
--- a/lldb/source/Plugins/ABI/ARC/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/ARC/CMakeLists.txt
@@ -1,13 +1,13 @@
 add_lldb_library(lldbPluginABIARC PLUGIN
   ABISysV_arc.cpp
 
+  LINK_COMPONENTS
+    Support
+    TargetParser
   LINK_LIBS
     lldbCore
     lldbSymbol
     lldbTarget
     lldbPluginProcessUtility
     lldbValueObject
-  LINK_COMPONENTS
-    Support
-    TargetParser
   )
diff --git a/lldb/source/Plugins/ABI/ARM/CMakeLists.txt b/lldb/source/Plugins/ABI/ARM/CMakeLists.txt
index f738489..e2ae014 100644
--- a/lldb/source/Plugins/ABI/ARM/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/ARM/CMakeLists.txt
@@ -3,13 +3,13 @@ add_lldb_library(lldbPluginABIARM PLUGIN
   ABIMacOSX_arm.cpp
   ABISysV_arm.cpp
 
+  LINK_COMPONENTS
+    Support
+    TargetParser
   LINK_LIBS
     lldbCore
     lldbSymbol
     lldbTarget
     lldbPluginProcessUtility
     lldbValueObject
-  LINK_COMPONENTS
-    Support
-    TargetParser
   )
diff --git a/lldb/source/Plugins/ABI/Hexagon/CMakeLists.txt b/lldb/source/Plugins/ABI/Hexagon/CMakeLists.txt
index 2bfc08d..63b32c2 100644
--- a/lldb/source/Plugins/ABI/Hexagon/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/Hexagon/CMakeLists.txt
@@ -1,12 +1,12 @@
 add_lldb_library(lldbPluginABIHexagon PLUGIN
   ABISysV_hexagon.cpp
 
+  LINK_COMPONENTS
+    Support
+    TargetParser
   LINK_LIBS
     lldbCore
     lldbSymbol
     lldbTarget
     lldbValueObject
-  LINK_COMPONENTS
-    Support
-    TargetParser
   )
diff --git a/lldb/source/Plugins/ABI/LoongArch/CMakeLists.txt b/lldb/source/Plugins/ABI/LoongArch/CMakeLists.txt
index 11ac433..a9a1165 100755
--- a/lldb/source/Plugins/ABI/LoongArch/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/LoongArch/CMakeLists.txt
@@ -1,12 +1,12 @@
 add_lldb_library(lldbPluginABILoongArch PLUGIN
   ABISysV_loongarch.cpp
 
+  LINK_COMPONENTS
+    Support
+    TargetParser
   LINK_LIBS
     lldbCore
     lldbSymbol
     lldbTarget
     lldbPluginProcessUtility
-  LINK_COMPONENTS
-    Support
-    TargetParser
   )
diff --git a/lldb/source/Plugins/ABI/MSP430/CMakeLists.txt b/lldb/source/Plugins/ABI/MSP430/CMakeLists.txt
index 6aff7a2..fd7bdb8 100644
--- a/lldb/source/Plugins/ABI/MSP430/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/MSP430/CMakeLists.txt
@@ -1,13 +1,13 @@
 add_lldb_library(lldbPluginABIMSP430 PLUGIN
   ABISysV_msp430.cpp
 
+  LINK_COMPONENTS
+    Support
+    TargetParser
   LINK_LIBS
     lldbCore
     lldbSymbol
     lldbTarget
     lldbValueObject
-  LINK_COMPONENTS
-    Support
-    TargetParser
   )
 
diff --git a/lldb/source/Plugins/ABI/Mips/CMakeLists.txt b/lldb/source/Plugins/ABI/Mips/CMakeLists.txt
index c7d0cc6..42f2a97 100644
--- a/lldb/source/Plugins/ABI/Mips/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/Mips/CMakeLists.txt
@@ -3,12 +3,12 @@ add_lldb_library(lldbPluginABIMips PLUGIN
   ABISysV_mips.cpp
   ABISysV_mips64.cpp
 
+  LINK_COMPONENTS
+    Support
+    TargetParser
   LINK_LIBS
     lldbCore
     lldbSymbol
     lldbTarget
     lldbValueObject
-  LINK_COMPONENTS
-    Support
-    TargetParser
   )
diff --git a/lldb/source/Plugins/ABI/PowerPC/CMakeLists.txt b/lldb/source/Plugins/ABI/PowerPC/CMakeLists.txt
index eff8cd6..bcb19bc 100644
--- a/lldb/source/Plugins/ABI/PowerPC/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/PowerPC/CMakeLists.txt
@@ -3,13 +3,13 @@ add_lldb_library(lldbPluginABIPowerPC PLUGIN
   ABISysV_ppc.cpp
   ABISysV_ppc64.cpp
 
+  LINK_COMPONENTS
+    Support
+    TargetParser
   LINK_LIBS
     lldbCore
     lldbSymbol
     lldbTarget
     lldbPluginTypeSystemClang
     lldbValueObject
-  LINK_COMPONENTS
-    Support
-    TargetParser
   )
diff --git a/lldb/source/Plugins/ABI/RISCV/CMakeLists.txt b/lldb/source/Plugins/ABI/RISCV/CMakeLists.txt
index 5b25bf7..68518ea 100755
--- a/lldb/source/Plugins/ABI/RISCV/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/RISCV/CMakeLists.txt
@@ -1,13 +1,13 @@
 add_lldb_library(lldbPluginABIRISCV PLUGIN
   ABISysV_riscv.cpp
 
+  LINK_COMPONENTS
+    Support
+    TargetParser
   LINK_LIBS
     lldbCore
     lldbSymbol
     lldbTarget
     lldbPluginProcessUtility
     lldbValueObject
-  LINK_COMPONENTS
-    Support
-    TargetParser
   )
diff --git a/lldb/source/Plugins/ABI/SystemZ/CMakeLists.txt b/lldb/source/Plugins/ABI/SystemZ/CMakeLists.txt
index b6164ed..c281fce 100644
--- a/lldb/source/Plugins/ABI/SystemZ/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/SystemZ/CMakeLists.txt
@@ -1,12 +1,12 @@
 add_lldb_library(lldbPluginABISystemZ PLUGIN
   ABISysV_s390x.cpp
 
+  LINK_COMPONENTS
+    Support
+    TargetParser
   LINK_LIBS
     lldbCore
     lldbSymbol
     lldbTarget
     lldbValueObject
-  LINK_COMPONENTS
-    Support
-    TargetParser
   )
diff --git a/lldb/source/Plugins/ABI/X86/CMakeLists.txt b/lldb/source/Plugins/ABI/X86/CMakeLists.txt
index eeab629..3f4537e 100644
--- a/lldb/source/Plugins/ABI/X86/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/X86/CMakeLists.txt
@@ -6,12 +6,12 @@ add_lldb_library(lldbPluginABIX86 PLUGIN
   ABISysV_x86_64.cpp
   ABIWindows_x86_64.cpp
 
+  LINK_COMPONENTS
+    Support
+    TargetParser
   LINK_LIBS
     lldbCore
     lldbSymbol
     lldbTarget
     lldbValueObject
-  LINK_COMPONENTS
-    Support
-    TargetParser
   )
diff --git a/lldb/source/Plugins/Architecture/AArch64/CMakeLists.txt b/lldb/source/Plugins/Architecture/AArch64/CMakeLists.txt
index 9bcf993..a762390 100644
--- a/lldb/source/Plugins/Architecture/AArch64/CMakeLists.txt
+++ b/lldb/source/Plugins/Architecture/AArch64/CMakeLists.txt
@@ -1,11 +1,11 @@
 add_lldb_library(lldbPluginArchitectureAArch64 PLUGIN
   ArchitectureAArch64.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbPluginProcessUtility
     lldbCore
     lldbTarget
     lldbUtility
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Plugins/Architecture/Arm/CMakeLists.txt b/lldb/source/Plugins/Architecture/Arm/CMakeLists.txt
index 60bbe69..b47b285 100644
--- a/lldb/source/Plugins/Architecture/Arm/CMakeLists.txt
+++ b/lldb/source/Plugins/Architecture/Arm/CMakeLists.txt
@@ -1,11 +1,11 @@
 add_lldb_library(lldbPluginArchitectureArm PLUGIN
   ArchitectureArm.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbPluginProcessUtility
     lldbCore
     lldbTarget
     lldbUtility
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Plugins/Architecture/Mips/CMakeLists.txt b/lldb/source/Plugins/Architecture/Mips/CMakeLists.txt
index 9734edc..d4b6776 100644
--- a/lldb/source/Plugins/Architecture/Mips/CMakeLists.txt
+++ b/lldb/source/Plugins/Architecture/Mips/CMakeLists.txt
@@ -1,10 +1,10 @@
 add_lldb_library(lldbPluginArchitectureMips PLUGIN
   ArchitectureMips.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbCore
     lldbTarget
     lldbUtility
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Plugins/Architecture/PPC64/CMakeLists.txt b/lldb/source/Plugins/Architecture/PPC64/CMakeLists.txt
index 2cba112..1ca0528 100644
--- a/lldb/source/Plugins/Architecture/PPC64/CMakeLists.txt
+++ b/lldb/source/Plugins/Architecture/PPC64/CMakeLists.txt
@@ -1,11 +1,11 @@
 add_lldb_library(lldbPluginArchitecturePPC64 PLUGIN
   ArchitecturePPC64.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbPluginProcessUtility
     lldbCore
     lldbTarget
     lldbUtility
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Plugins/Disassembler/LLVMC/CMakeLists.txt b/lldb/source/Plugins/Disassembler/LLVMC/CMakeLists.txt
index 60a091e..b498389 100644
--- a/lldb/source/Plugins/Disassembler/LLVMC/CMakeLists.txt
+++ b/lldb/source/Plugins/Disassembler/LLVMC/CMakeLists.txt
@@ -1,10 +1,6 @@
 add_lldb_library(lldbPluginDisassemblerLLVMC PLUGIN
   DisassemblerLLVMC.cpp
 
-  LINK_LIBS
-    lldbCore
-    lldbSymbol
-    lldbTarget
   LINK_COMPONENTS
     ${LLVM_TARGETS_TO_BUILD}
     MC
@@ -12,4 +8,8 @@ add_lldb_library(lldbPluginDisassemblerLLVMC PLUGIN
     RuntimeDyld
     Support
     TargetParser
+  LINK_LIBS
+    lldbCore
+    lldbSymbol
+    lldbTarget
   )
diff --git a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/CMakeLists.txt b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/CMakeLists.txt
index 7308374..20fafb2 100644
--- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/CMakeLists.txt
+++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/CMakeLists.txt
@@ -3,6 +3,9 @@ add_lldb_library(lldbPluginDynamicLoaderMacOSXDYLD PLUGIN
   DynamicLoaderMacOS.cpp
   DynamicLoaderDarwin.cpp
 
+  LINK_COMPONENTS
+    Support
+    TargetParser
   LINK_LIBS
     lldbBreakpoint
     lldbCore
@@ -12,7 +15,4 @@ add_lldb_library(lldbPluginDynamicLoaderMacOSXDYLD PLUGIN
     lldbTarget
     lldbUtility
     lldbPluginTypeSystemClang
-  LINK_COMPONENTS
-    Support
-    TargetParser
   )
diff --git a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/CMakeLists.txt b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/CMakeLists.txt
index c1e00b2..0ee25d7 100644
--- a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/CMakeLists.txt
+++ b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/CMakeLists.txt
@@ -2,6 +2,8 @@ add_lldb_library(lldbPluginDynamicLoaderPosixDYLD PLUGIN
   DYLDRendezvous.cpp
   DynamicLoaderPOSIXDYLD.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbBreakpoint
     lldbCore
@@ -10,6 +12,4 @@ add_lldb_library(lldbPluginDynamicLoaderPosixDYLD PLUGIN
     lldbTarget
     lldbPluginProcessElfCore
     lldbPluginProcessUtility
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Plugins/DynamicLoader/Windows-DYLD/CMakeLists.txt b/lldb/source/Plugins/DynamicLoader/Windows-DYLD/CMakeLists.txt
index 044d67c..4c21457 100644
--- a/lldb/source/Plugins/DynamicLoader/Windows-DYLD/CMakeLists.txt
+++ b/lldb/source/Plugins/DynamicLoader/Windows-DYLD/CMakeLists.txt
@@ -1,10 +1,10 @@
 add_lldb_library(lldbPluginDynamicLoaderWindowsDYLD PLUGIN
   DynamicLoaderWindowsDYLD.cpp
 
-  LINK_LIBS
-    lldbCore
-    lldbTarget
   LINK_COMPONENTS
     Support
     TargetParser
+  LINK_LIBS
+    lldbCore
+    lldbTarget
   )
diff --git a/lldb/source/Plugins/DynamicLoader/wasm-DYLD/CMakeLists.txt b/lldb/source/Plugins/DynamicLoader/wasm-DYLD/CMakeLists.txt
index a4a4ac7..0adbcd0 100644
--- a/lldb/source/Plugins/DynamicLoader/wasm-DYLD/CMakeLists.txt
+++ b/lldb/source/Plugins/DynamicLoader/wasm-DYLD/CMakeLists.txt
@@ -1,9 +1,9 @@
 add_lldb_library(lldbPluginDynamicLoaderWasmDYLD PLUGIN
   DynamicLoaderWasmDYLD.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbCore
     lldbTarget
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Plugins/ExpressionParser/Clang/CMakeLists.txt b/lldb/source/Plugins/ExpressionParser/Clang/CMakeLists.txt
index 675cd06..2aae7d1 100644
--- a/lldb/source/Plugins/ExpressionParser/Clang/CMakeLists.txt
+++ b/lldb/source/Plugins/ExpressionParser/Clang/CMakeLists.txt
@@ -29,6 +29,13 @@ add_lldb_library(lldbPluginExpressionParserClang
   DEPENDS
   intrinsics_gen
 
+  LINK_COMPONENTS
+    Core
+    ExecutionEngine
+    ipo
+    MCJIT
+    Support
+    TargetParser
   LINK_LIBS
     lldbCore
     lldbExpression
@@ -54,11 +61,4 @@ add_lldb_library(lldbPluginExpressionParserClang
     clangRewriteFrontend
     clangSema
     clangSerialization
-  LINK_COMPONENTS
-    Core
-    ExecutionEngine
-    ipo
-    MCJIT
-    Support
-    TargetParser
   )
diff --git a/lldb/source/Plugins/Instruction/ARM/CMakeLists.txt b/lldb/source/Plugins/Instruction/ARM/CMakeLists.txt
index 24f803d..f1e7646 100644
--- a/lldb/source/Plugins/Instruction/ARM/CMakeLists.txt
+++ b/lldb/source/Plugins/Instruction/ARM/CMakeLists.txt
@@ -2,6 +2,8 @@ add_lldb_library(lldbPluginInstructionARM PLUGIN
   EmulateInstructionARM.cpp
   EmulationStateARM.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbCore
     lldbHost
@@ -9,6 +11,4 @@ add_lldb_library(lldbPluginInstructionARM PLUGIN
     lldbSymbol
     lldbTarget
     lldbPluginProcessUtility
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Plugins/Instruction/ARM64/CMakeLists.txt b/lldb/source/Plugins/Instruction/ARM64/CMakeLists.txt
index effe0e3..975ff7f 100644
--- a/lldb/source/Plugins/Instruction/ARM64/CMakeLists.txt
+++ b/lldb/source/Plugins/Instruction/ARM64/CMakeLists.txt
@@ -1,11 +1,11 @@
 add_lldb_library(lldbPluginInstructionARM64 PLUGIN
   EmulateInstructionARM64.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbCore
     lldbInterpreter
     lldbSymbol
     lldbPluginProcessUtility
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Plugins/Instruction/LoongArch/CMakeLists.txt b/lldb/source/Plugins/Instruction/LoongArch/CMakeLists.txt
index 59802ee..41dc0f1 100644
--- a/lldb/source/Plugins/Instruction/LoongArch/CMakeLists.txt
+++ b/lldb/source/Plugins/Instruction/LoongArch/CMakeLists.txt
@@ -1,11 +1,11 @@
 add_lldb_library(lldbPluginInstructionLoongArch PLUGIN
   EmulateInstructionLoongArch.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbCore
     lldbInterpreter
     lldbPluginProcessUtility
     lldbSymbol
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Plugins/Instruction/MIPS/CMakeLists.txt b/lldb/source/Plugins/Instruction/MIPS/CMakeLists.txt
index d25735d..1934937 100644
--- a/lldb/source/Plugins/Instruction/MIPS/CMakeLists.txt
+++ b/lldb/source/Plugins/Instruction/MIPS/CMakeLists.txt
@@ -5,13 +5,13 @@ endif()
 add_lldb_library(lldbPluginInstructionMIPS PLUGIN
   EmulateInstructionMIPS.cpp
 
+  LINK_COMPONENTS
+    MC
+    Support
+    ${mips_target}
   LINK_LIBS
     lldbCore
     lldbSymbol
     lldbTarget
     lldbPluginProcessUtility
-  LINK_COMPONENTS
-    MC
-    Support
-    ${mips_target}
   )
diff --git a/lldb/source/Plugins/Instruction/MIPS64/CMakeLists.txt b/lldb/source/Plugins/Instruction/MIPS64/CMakeLists.txt
index ddb964b..b0711eb 100644
--- a/lldb/source/Plugins/Instruction/MIPS64/CMakeLists.txt
+++ b/lldb/source/Plugins/Instruction/MIPS64/CMakeLists.txt
@@ -5,14 +5,14 @@ endif()
 add_lldb_library(lldbPluginInstructionMIPS64 PLUGIN
   EmulateInstructionMIPS64.cpp
 
+  LINK_COMPONENTS
+    MC
+    Support
+    ${mips_target}
   LINK_LIBS
     lldbCore
     lldbHost
     lldbInterpreter
     lldbSymbol
     lldbPluginProcessUtility
-  LINK_COMPONENTS
-    MC
-    Support
-    ${mips_target}
   )
diff --git a/lldb/source/Plugins/Instruction/PPC64/CMakeLists.txt b/lldb/source/Plugins/Instruction/PPC64/CMakeLists.txt
index 0926433..c97211d 100644
--- a/lldb/source/Plugins/Instruction/PPC64/CMakeLists.txt
+++ b/lldb/source/Plugins/Instruction/PPC64/CMakeLists.txt
@@ -1,11 +1,11 @@
 add_lldb_library(lldbPluginInstructionPPC64 PLUGIN
   EmulateInstructionPPC64.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbCore
     lldbInterpreter
     lldbSymbol
     lldbPluginProcessUtility
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Plugins/Instruction/RISCV/CMakeLists.txt b/lldb/source/Plugins/Instruction/RISCV/CMakeLists.txt
index ed05d4a..4b613f9 100644
--- a/lldb/source/Plugins/Instruction/RISCV/CMakeLists.txt
+++ b/lldb/source/Plugins/Instruction/RISCV/CMakeLists.txt
@@ -1,11 +1,11 @@
 add_lldb_library(lldbPluginInstructionRISCV PLUGIN
   EmulateInstructionRISCV.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbCore
     lldbInterpreter
     lldbSymbol
     lldbPluginProcessUtility
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Plugins/InstrumentationRuntime/MainThreadChecker/CMakeLists.txt b/lldb/source/Plugins/InstrumentationRuntime/MainThreadChecker/CMakeLists.txt
index 8095658..7f035ad 100644
--- a/lldb/source/Plugins/InstrumentationRuntime/MainThreadChecker/CMakeLists.txt
+++ b/lldb/source/Plugins/InstrumentationRuntime/MainThreadChecker/CMakeLists.txt
@@ -1,6 +1,8 @@
 add_lldb_library(lldbPluginInstrumentationRuntimeMainThreadChecker PLUGIN
   InstrumentationRuntimeMainThreadChecker.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbBreakpoint
     lldbCore
@@ -8,6 +10,4 @@ add_lldb_library(lldbPluginInstrumentationRuntimeMainThreadChecker PLUGIN
     lldbInterpreter
     lldbSymbol
     lldbTarget
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Plugins/InstrumentationRuntime/UBSan/CMakeLists.txt b/lldb/source/Plugins/InstrumentationRuntime/UBSan/CMakeLists.txt
index 156bd3a..5cd59d7 100644
--- a/lldb/source/Plugins/InstrumentationRuntime/UBSan/CMakeLists.txt
+++ b/lldb/source/Plugins/InstrumentationRuntime/UBSan/CMakeLists.txt
@@ -1,6 +1,8 @@
 add_lldb_library(lldbPluginInstrumentationRuntimeUBSan PLUGIN
   InstrumentationRuntimeUBSan.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbBreakpoint
     lldbCore
@@ -9,6 +11,4 @@ add_lldb_library(lldbPluginInstrumentationRuntimeUBSan PLUGIN
     lldbSymbol
     lldbTarget
     lldbValueObject
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Plugins/JITLoader/GDB/CMakeLists.txt b/lldb/source/Plugins/JITLoader/GDB/CMakeLists.txt
index ecdff28..b66be41 100644
--- a/lldb/source/Plugins/JITLoader/GDB/CMakeLists.txt
+++ b/lldb/source/Plugins/JITLoader/GDB/CMakeLists.txt
@@ -9,6 +9,8 @@ lldb_tablegen(JITLoaderGDBPropertiesEnum.inc -gen-lldb-property-enum-defs
 add_lldb_library(lldbPluginJITLoaderGDB PLUGIN
   JITLoaderGDB.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbBreakpoint
     lldbCore
@@ -17,8 +19,6 @@ add_lldb_library(lldbPluginJITLoaderGDB PLUGIN
     lldbTarget
     lldbUtility
     lldbPluginObjectFileMachO
-  LINK_COMPONENTS
-    Support
   )
 
 add_dependencies(lldbPluginJITLoaderGDB
diff --git a/lldb/source/Plugins/Language/CPlusPlus/CMakeLists.txt b/lldb/source/Plugins/Language/CPlusPlus/CMakeLists.txt
index 9bb10c2..5ba2567 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/CMakeLists.txt
+++ b/lldb/source/Plugins/Language/CPlusPlus/CMakeLists.txt
@@ -34,6 +34,8 @@ add_lldb_library(lldbPluginCPlusPlusLanguage PLUGIN
   LibStdcppUniquePointer.cpp
   MSVCUndecoratedNameParser.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbCore
     lldbDataFormatters
@@ -45,9 +47,6 @@ add_lldb_library(lldbPluginCPlusPlusLanguage PLUGIN
     lldbPluginClangCommon
     lldbPluginCPPRuntime
     lldbPluginTypeSystemClang
-
-  LINK_COMPONENTS
-    Support
 )
 
 add_dependencies(lldbPluginCPlusPlusLanguage
diff --git a/lldb/source/Plugins/Language/ClangCommon/CMakeLists.txt b/lldb/source/Plugins/Language/ClangCommon/CMakeLists.txt
index 980d788..470dbc2 100644
--- a/lldb/source/Plugins/Language/ClangCommon/CMakeLists.txt
+++ b/lldb/source/Plugins/Language/ClangCommon/CMakeLists.txt
@@ -1,9 +1,9 @@
 add_lldb_library(lldbPluginClangCommon
   ClangHighlighter.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbCore
     lldbUtility
-  LINK_COMPONENTS
-    Support
 )
diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/CMakeLists.txt b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/CMakeLists.txt
index 53320d3..0b2dfe1 100644
--- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/CMakeLists.txt
+++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/CMakeLists.txt
@@ -8,6 +8,8 @@ add_lldb_library(lldbPluginAppleObjCRuntime PLUGIN
   AppleObjCClassDescriptorV2.cpp
   AppleObjCTypeEncodingParser.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbBreakpoint
     lldbCore
@@ -23,6 +25,4 @@ add_lldb_library(lldbPluginAppleObjCRuntime PLUGIN
     lldbPluginTypeSystemClang
   CLANG_LIBS
     clangAST
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/GNUstepObjCRuntime/CMakeLists.txt b/lldb/source/Plugins/LanguageRuntime/ObjC/GNUstepObjCRuntime/CMakeLists.txt
index 0c7bff7..05caad3e 100644
--- a/lldb/source/Plugins/LanguageRuntime/ObjC/GNUstepObjCRuntime/CMakeLists.txt
+++ b/lldb/source/Plugins/LanguageRuntime/ObjC/GNUstepObjCRuntime/CMakeLists.txt
@@ -1,6 +1,8 @@
 add_lldb_library(lldbPluginGNUstepObjCRuntime PLUGIN
   GNUstepObjCRuntime.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbBreakpoint
     lldbCore
@@ -15,6 +17,4 @@ add_lldb_library(lldbPluginGNUstepObjCRuntime PLUGIN
     lldbPluginTypeSystemClang
   CLANG_LIBS
     clangAST
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Plugins/ObjectContainer/BSD-Archive/CMakeLists.txt b/lldb/source/Plugins/ObjectContainer/BSD-Archive/CMakeLists.txt
index acc13d3..1040e3d 100644
--- a/lldb/source/Plugins/ObjectContainer/BSD-Archive/CMakeLists.txt
+++ b/lldb/source/Plugins/ObjectContainer/BSD-Archive/CMakeLists.txt
@@ -1,10 +1,10 @@
 add_lldb_library(lldbPluginObjectContainerBSDArchive PLUGIN
   ObjectContainerBSDArchive.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbCore
     lldbHost
     lldbSymbol
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Plugins/ObjectFile/Breakpad/CMakeLists.txt b/lldb/source/Plugins/ObjectFile/Breakpad/CMakeLists.txt
index 705e2d4..87f3b1d 100644
--- a/lldb/source/Plugins/ObjectFile/Breakpad/CMakeLists.txt
+++ b/lldb/source/Plugins/ObjectFile/Breakpad/CMakeLists.txt
@@ -2,12 +2,12 @@ add_lldb_library(lldbPluginObjectFileBreakpad PLUGIN
   BreakpadRecords.cpp
   ObjectFileBreakpad.cpp
 
+  LINK_COMPONENTS
+    Support
+    TargetParser
   LINK_LIBS
     lldbCore
     lldbHost
     lldbSymbol
     lldbUtility
-  LINK_COMPONENTS
-    Support
-    TargetParser
   )
diff --git a/lldb/source/Plugins/ObjectFile/COFF/CMakeLists.txt b/lldb/source/Plugins/ObjectFile/COFF/CMakeLists.txt
index e65b7ea..c7341d3 100644
--- a/lldb/source/Plugins/ObjectFile/COFF/CMakeLists.txt
+++ b/lldb/source/Plugins/ObjectFile/COFF/CMakeLists.txt
@@ -1,13 +1,13 @@
 add_lldb_library(lldbPluginObjectFileCOFF PLUGIN
   ObjectFileCOFF.cpp
 
+  LINK_COMPONENTS
+    BinaryFormat
+    Object
+    Support
   LINK_LIBS
     lldbCore
     lldbHost
     lldbSymbol
     lldbTarget
-
-  LINK_COMPONENTS
-    BinaryFormat
-    Object
-    Support)
+  )
diff --git a/lldb/source/Plugins/ObjectFile/ELF/CMakeLists.txt b/lldb/source/Plugins/ObjectFile/ELF/CMakeLists.txt
index 45a4edc..90aed25 100644
--- a/lldb/source/Plugins/ObjectFile/ELF/CMakeLists.txt
+++ b/lldb/source/Plugins/ObjectFile/ELF/CMakeLists.txt
@@ -2,13 +2,13 @@ add_lldb_library(lldbPluginObjectFileELF PLUGIN
   ELFHeader.cpp
   ObjectFileELF.cpp
 
+  LINK_COMPONENTS
+    BinaryFormat
+    Object
+    Support
   LINK_LIBS
     lldbCore
     lldbHost
     lldbSymbol
     lldbTarget
-  LINK_COMPONENTS
-    BinaryFormat
-    Object
-    Support
   )
diff --git a/lldb/source/Plugins/ObjectFile/JSON/CMakeLists.txt b/lldb/source/Plugins/ObjectFile/JSON/CMakeLists.txt
index 73a8697..af35879 100644
--- a/lldb/source/Plugins/ObjectFile/JSON/CMakeLists.txt
+++ b/lldb/source/Plugins/ObjectFile/JSON/CMakeLists.txt
@@ -1,12 +1,12 @@
 add_lldb_library(lldbPluginObjectFileJSON PLUGIN
   ObjectFileJSON.cpp
 
+  LINK_COMPONENTS
+    Support
+    TargetParser
   LINK_LIBS
     lldbCore
     lldbHost
     lldbSymbol
     lldbUtility
-  LINK_COMPONENTS
-    Support
-    TargetParser
   )
diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/CMakeLists.txt b/lldb/source/Plugins/ObjectFile/Mach-O/CMakeLists.txt
index d39b937..a16fcd8 100644
--- a/lldb/source/Plugins/ObjectFile/Mach-O/CMakeLists.txt
+++ b/lldb/source/Plugins/ObjectFile/Mach-O/CMakeLists.txt
@@ -1,6 +1,8 @@
 add_lldb_library(lldbPluginObjectFileMachO PLUGIN
   ObjectFileMachO.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbCore
     lldbHost
@@ -8,6 +10,4 @@ add_lldb_library(lldbPluginObjectFileMachO PLUGIN
     lldbTarget
     lldbUtility
     lldbPluginProcessUtility
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Plugins/ObjectFile/Minidump/CMakeLists.txt b/lldb/source/Plugins/ObjectFile/Minidump/CMakeLists.txt
index ac5fba2..5be4f40 100644
--- a/lldb/source/Plugins/ObjectFile/Minidump/CMakeLists.txt
+++ b/lldb/source/Plugins/ObjectFile/Minidump/CMakeLists.txt
@@ -2,6 +2,8 @@ add_lldb_library(lldbPluginObjectFileMinidump PLUGIN
   ObjectFileMinidump.cpp
   MinidumpFileBuilder.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbCore
     lldbHost
@@ -9,6 +11,4 @@ add_lldb_library(lldbPluginObjectFileMinidump PLUGIN
     lldbTarget
     lldbUtility
     lldbPluginProcessUtility
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Plugins/ObjectFile/PDB/CMakeLists.txt b/lldb/source/Plugins/ObjectFile/PDB/CMakeLists.txt
index d5ade2b..b693b43 100644
--- a/lldb/source/Plugins/ObjectFile/PDB/CMakeLists.txt
+++ b/lldb/source/Plugins/ObjectFile/PDB/CMakeLists.txt
@@ -1,10 +1,10 @@
 add_lldb_library(lldbPluginObjectFilePDB PLUGIN
   ObjectFilePDB.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbCore
     lldbSymbol
     lldbUtility
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Plugins/ObjectFile/PECOFF/CMakeLists.txt b/lldb/source/Plugins/ObjectFile/PECOFF/CMakeLists.txt
index 26a7641..97ba403 100644
--- a/lldb/source/Plugins/ObjectFile/PECOFF/CMakeLists.txt
+++ b/lldb/source/Plugins/ObjectFile/PECOFF/CMakeLists.txt
@@ -18,16 +18,16 @@ add_lldb_library(lldbPluginObjectFilePECOFF PLUGIN
   PECallFrameInfo.cpp
   WindowsMiniDump.cpp
 
+  LINK_COMPONENTS
+    BinaryFormat
+    Support
+    TargetParser
   LINK_LIBS
     lldbCore
     lldbHost
     lldbSymbol
     lldbTarget
     ${DBGHELP_LINK_FILES}
-  LINK_COMPONENTS
-    BinaryFormat
-    Support
-    TargetParser
   )
 
 add_dependencies(lldbPluginObjectFilePECOFF
diff --git a/lldb/source/Plugins/ObjectFile/Placeholder/CMakeLists.txt b/lldb/source/Plugins/ObjectFile/Placeholder/CMakeLists.txt
index d7f8762..f4b66a2 100644
--- a/lldb/source/Plugins/ObjectFile/Placeholder/CMakeLists.txt
+++ b/lldb/source/Plugins/ObjectFile/Placeholder/CMakeLists.txt
@@ -1,12 +1,12 @@
 add_lldb_library(lldbPluginObjectFilePlaceholder PLUGIN
   ObjectFilePlaceholder.cpp
 
+  LINK_COMPONENTS
+    Object
+    Support
   LINK_LIBS
     lldbCore
     lldbHost
     lldbSymbol
     lldbTarget
-  LINK_COMPONENTS
-    Object
-    Support
   )
diff --git a/lldb/source/Plugins/ObjectFile/XCOFF/CMakeLists.txt b/lldb/source/Plugins/ObjectFile/XCOFF/CMakeLists.txt
index 8840248..f360088 100644
--- a/lldb/source/Plugins/ObjectFile/XCOFF/CMakeLists.txt
+++ b/lldb/source/Plugins/ObjectFile/XCOFF/CMakeLists.txt
@@ -1,13 +1,13 @@
 add_lldb_library(lldbPluginObjectFileXCOFF PLUGIN
   ObjectFileXCOFF.cpp
 
+  LINK_COMPONENTS
+    BinaryFormat
+    Object
+    Support
   LINK_LIBS
     lldbCore
     lldbHost
     lldbSymbol
     lldbTarget
-  LINK_COMPONENTS
-    BinaryFormat
-    Object
-    Support
   )
diff --git a/lldb/source/Plugins/ObjectFile/wasm/CMakeLists.txt b/lldb/source/Plugins/ObjectFile/wasm/CMakeLists.txt
index 5069b6b..9a46c91 100644
--- a/lldb/source/Plugins/ObjectFile/wasm/CMakeLists.txt
+++ b/lldb/source/Plugins/ObjectFile/wasm/CMakeLists.txt
@@ -1,11 +1,11 @@
 add_lldb_library(lldbPluginObjectFileWasm PLUGIN
   ObjectFileWasm.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbCore
     lldbHost
     lldbSymbol
     lldbUtility
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Plugins/Platform/Android/CMakeLists.txt b/lldb/source/Plugins/Platform/Android/CMakeLists.txt
index 7ffccc3..7110837 100644
--- a/lldb/source/Plugins/Platform/Android/CMakeLists.txt
+++ b/lldb/source/Plugins/Platform/Android/CMakeLists.txt
@@ -11,14 +11,14 @@ add_lldb_library(lldbPluginPlatformAndroid PLUGIN
   PlatformAndroid.cpp
   PlatformAndroidRemoteGDBServer.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbCore
     lldbHost
     lldbValueObject
     lldbPluginPlatformLinux
     lldbPluginPlatformGDB
-  LINK_COMPONENTS
-    Support
   )
 
 add_dependencies(lldbPluginPlatformAndroid
diff --git a/lldb/source/Plugins/Platform/FreeBSD/CMakeLists.txt b/lldb/source/Plugins/Platform/FreeBSD/CMakeLists.txt
index 5301445..b9366da 100644
--- a/lldb/source/Plugins/Platform/FreeBSD/CMakeLists.txt
+++ b/lldb/source/Plugins/Platform/FreeBSD/CMakeLists.txt
@@ -1,13 +1,12 @@
 add_lldb_library(lldbPluginPlatformFreeBSD PLUGIN
   PlatformFreeBSD.cpp
 
+  LINK_COMPONENTS
+    TargetParser
    LINK_LIBS
     lldbBreakpoint
     lldbCore
     lldbHost
     lldbTarget
     lldbPluginPlatformPOSIX
-
-  LINK_COMPONENTS
-    TargetParser
   )
diff --git a/lldb/source/Plugins/Platform/MacOSX/CMakeLists.txt b/lldb/source/Plugins/Platform/MacOSX/CMakeLists.txt
index 8c1e9f4..5984724 100644
--- a/lldb/source/Plugins/Platform/MacOSX/CMakeLists.txt
+++ b/lldb/source/Plugins/Platform/MacOSX/CMakeLists.txt
@@ -37,6 +37,9 @@ endif()
 add_lldb_library(lldbPluginPlatformMacOSX PLUGIN
   ${PLUGIN_PLATFORM_MACOSX_SOURCES}
 
+  LINK_COMPONENTS
+    Support
+    TargetParser
   LINK_LIBS
     lldbBreakpoint
     lldbCore
@@ -51,9 +54,6 @@ add_lldb_library(lldbPluginPlatformMacOSX PLUGIN
     ${OBJC_LIBS}
   CLANG_LIBS
     clangBasic
-  LINK_COMPONENTS
-    Support
-    TargetParser
     )
 
 add_dependencies(lldbPluginPlatformMacOSX
diff --git a/lldb/source/Plugins/Platform/MacOSX/objcxx/CMakeLists.txt b/lldb/source/Plugins/Platform/MacOSX/objcxx/CMakeLists.txt
index 7d094a5..8640aac 100644
--- a/lldb/source/Plugins/Platform/MacOSX/objcxx/CMakeLists.txt
+++ b/lldb/source/Plugins/Platform/MacOSX/objcxx/CMakeLists.txt
@@ -4,16 +4,15 @@ include_directories(.)
 add_lldb_library(lldbPluginPlatformMacOSXObjCXX
   PlatformiOSSimulatorCoreSimulatorSupport.mm
 
+  LINK_COMPONENTS
+    Object
+    Support
   LINK_LIBS
     lldbCore
     lldbSymbol
     lldbTarget
     lldbUtility
     ${EXTRA_LIBS}
-
-  LINK_COMPONENTS
-    Object
-    Support
   )
 
 
diff --git a/lldb/source/Plugins/Platform/QemuUser/CMakeLists.txt b/lldb/source/Plugins/Platform/QemuUser/CMakeLists.txt
index 03a5ba1..dc3ff75 100644
--- a/lldb/source/Plugins/Platform/QemuUser/CMakeLists.txt
+++ b/lldb/source/Plugins/Platform/QemuUser/CMakeLists.txt
@@ -9,10 +9,10 @@ lldb_tablegen(PlatformQemuUserPropertiesEnum.inc -gen-lldb-property-enum-defs
 add_lldb_library(lldbPluginPlatformQemuUser PLUGIN
   PlatformQemuUser.cpp
 
-  LINK_LIBS
-    lldbUtility
   LINK_COMPONENTS
     Support
+  LINK_LIBS
+    lldbUtility
     )
 
 add_dependencies(lldbPluginPlatformQemuUser
diff --git a/lldb/source/Plugins/Platform/Windows/CMakeLists.txt b/lldb/source/Plugins/Platform/Windows/CMakeLists.txt
index 2820ae7..7f00425 100644
--- a/lldb/source/Plugins/Platform/Windows/CMakeLists.txt
+++ b/lldb/source/Plugins/Platform/Windows/CMakeLists.txt
@@ -1,13 +1,12 @@
 add_lldb_library(lldbPluginPlatformWindows PLUGIN
   PlatformWindows.cpp
 
+   LINK_COMPONENTS
+    Support
    LINK_LIBS
     lldbBreakpoint
     lldbCore
     lldbHost
     lldbTarget
     lldbPluginPlatformGDB
-
-   LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Plugins/Process/AIX/CMakeLists.txt b/lldb/source/Plugins/Process/AIX/CMakeLists.txt
index 911f303..6b3151e 100644
--- a/lldb/source/Plugins/Process/AIX/CMakeLists.txt
+++ b/lldb/source/Plugins/Process/AIX/CMakeLists.txt
@@ -2,6 +2,8 @@ add_lldb_library(lldbPluginProcessAIX
   NativeProcessAIX.cpp
   NativeThreadAIX.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbCore
     lldbHost
@@ -10,8 +12,6 @@ add_lldb_library(lldbPluginProcessAIX
     lldbUtility
     lldbPluginProcessPOSIX
     lldbPluginProcessUtility
-  LINK_COMPONENTS
-    Support
   )
 
 target_compile_definitions(lldbPluginProcessAIX PRIVATE "-D_ALL_SOURCE")
diff --git a/lldb/source/Plugins/Process/FreeBSD/CMakeLists.txt b/lldb/source/Plugins/Process/FreeBSD/CMakeLists.txt
index 598911c..4c11d21 100644
--- a/lldb/source/Plugins/Process/FreeBSD/CMakeLists.txt
+++ b/lldb/source/Plugins/Process/FreeBSD/CMakeLists.txt
@@ -8,6 +8,8 @@ add_lldb_library(lldbPluginProcessFreeBSD
   NativeRegisterContextFreeBSD_x86_64.cpp
   NativeThreadFreeBSD.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbHost
     lldbSymbol
@@ -15,6 +17,4 @@ add_lldb_library(lldbPluginProcessFreeBSD
     lldbUtility
     lldbPluginProcessPOSIX
     lldbPluginProcessUtility
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Plugins/Process/FreeBSDKernel/CMakeLists.txt b/lldb/source/Plugins/Process/FreeBSDKernel/CMakeLists.txt
index ca89ab0..b0d1370 100644
--- a/lldb/source/Plugins/Process/FreeBSDKernel/CMakeLists.txt
+++ b/lldb/source/Plugins/Process/FreeBSDKernel/CMakeLists.txt
@@ -18,10 +18,10 @@ add_lldb_library(lldbPluginProcessFreeBSDKernel PLUGIN
   RegisterContextFreeBSDKernel_x86_64.cpp
   ThreadFreeBSDKernel.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbCore
     lldbTarget
     ${FBSDKERNEL_LIBS}
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Plugins/Process/Linux/CMakeLists.txt b/lldb/source/Plugins/Process/Linux/CMakeLists.txt
index 708252f..33af2e2 100644
--- a/lldb/source/Plugins/Process/Linux/CMakeLists.txt
+++ b/lldb/source/Plugins/Process/Linux/CMakeLists.txt
@@ -18,6 +18,9 @@ add_lldb_library(lldbPluginProcessLinux
   Procfs.cpp
   SingleStepCheck.cpp
 
+  LINK_COMPONENTS
+    Support
+    TargetParser
   LINK_LIBS
     lldbCore
     lldbHost
@@ -26,7 +29,4 @@ add_lldb_library(lldbPluginProcessLinux
     lldbUtility
     lldbPluginProcessPOSIX
     lldbPluginProcessUtility
-  LINK_COMPONENTS
-    Support
-    TargetParser
   )
diff --git a/lldb/source/Plugins/Process/NetBSD/CMakeLists.txt b/lldb/source/Plugins/Process/NetBSD/CMakeLists.txt
index 13f3790..f48ea86 100644
--- a/lldb/source/Plugins/Process/NetBSD/CMakeLists.txt
+++ b/lldb/source/Plugins/Process/NetBSD/CMakeLists.txt
@@ -4,6 +4,8 @@ add_lldb_library(lldbPluginProcessNetBSD
   NativeRegisterContextNetBSD_x86_64.cpp
   NativeThreadNetBSD.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbHost
     lldbSymbol
@@ -12,6 +14,4 @@ add_lldb_library(lldbPluginProcessNetBSD
     lldbPluginProcessPOSIX
     lldbPluginProcessUtility
     util
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Plugins/Process/POSIX/CMakeLists.txt b/lldb/source/Plugins/Process/POSIX/CMakeLists.txt
index 81effaa..ee6fa6a 100644
--- a/lldb/source/Plugins/Process/POSIX/CMakeLists.txt
+++ b/lldb/source/Plugins/Process/POSIX/CMakeLists.txt
@@ -3,9 +3,9 @@ add_lldb_library(lldbPluginProcessPOSIX
   NativeProcessELF.cpp
   ProcessPOSIXLog.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbPluginProcessUtility
     lldbUtility
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Plugins/Process/Utility/CMakeLists.txt b/lldb/source/Plugins/Process/Utility/CMakeLists.txt
index 8b36919..fd30196 100644
--- a/lldb/source/Plugins/Process/Utility/CMakeLists.txt
+++ b/lldb/source/Plugins/Process/Utility/CMakeLists.txt
@@ -63,6 +63,9 @@ add_lldb_library(lldbPluginProcessUtility
   StopInfoMachException.cpp
   ThreadMemory.cpp
 
+  LINK_COMPONENTS
+    Support
+    TargetParser
   LINK_LIBS
     lldbBreakpoint
     lldbCore
@@ -73,7 +76,4 @@ add_lldb_library(lldbPluginProcessUtility
     lldbTarget
     lldbUtility
     lldbValueObject
-  LINK_COMPONENTS
-    Support
-    TargetParser
   )
diff --git a/lldb/source/Plugins/Process/Windows/Common/CMakeLists.txt b/lldb/source/Plugins/Process/Windows/Common/CMakeLists.txt
index e77c204..9854b79 100644
--- a/lldb/source/Plugins/Process/Windows/Common/CMakeLists.txt
+++ b/lldb/source/Plugins/Process/Windows/Common/CMakeLists.txt
@@ -20,6 +20,8 @@ add_lldb_library(lldbPluginProcessWindowsCommon PLUGIN
   x64/RegisterContextWindows_x64.cpp
   x86/RegisterContextWindows_x86.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbCore
     lldbHost
@@ -30,6 +32,4 @@ add_lldb_library(lldbPluginProcessWindowsCommon PLUGIN
     ws2_32
     rpcrt4
     psapi
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Plugins/Process/elf-core/CMakeLists.txt b/lldb/source/Plugins/Process/elf-core/CMakeLists.txt
index 4b0f519..0bc26bb 100644
--- a/lldb/source/Plugins/Process/elf-core/CMakeLists.txt
+++ b/lldb/source/Plugins/Process/elf-core/CMakeLists.txt
@@ -14,13 +14,13 @@ add_lldb_library(lldbPluginProcessElfCore PLUGIN
   RegisterContextPOSIXCore_loongarch64.cpp
   RegisterUtilities.cpp
 
+  LINK_COMPONENTS
+    BinaryFormat
+    Support
   LINK_LIBS
     lldbCore
     lldbTarget
     lldbPluginDynamicLoaderPosixDYLD
     lldbPluginObjectFileELF
     lldbPluginProcessUtility
-  LINK_COMPONENTS
-    BinaryFormat
-    Support
   )
diff --git a/lldb/source/Plugins/Process/gdb-remote/CMakeLists.txt b/lldb/source/Plugins/Process/gdb-remote/CMakeLists.txt
index 6755999..5c39384 100644
--- a/lldb/source/Plugins/Process/gdb-remote/CMakeLists.txt
+++ b/lldb/source/Plugins/Process/gdb-remote/CMakeLists.txt
@@ -33,6 +33,9 @@ add_lldb_library(lldbPluginProcessGDBRemote PLUGIN
   ProcessGDBRemoteLog.cpp
   ThreadGDBRemote.cpp
 
+  LINK_COMPONENTS
+    Support
+    TargetParser
   LINK_LIBS
     lldbBreakpoint
     lldbCore
@@ -45,9 +48,6 @@ add_lldb_library(lldbPluginProcessGDBRemote PLUGIN
     ${LLDB_SYSTEM_LIBS}
     ${LLDB_PLUGINS}
     ${LIBCOMPRESSION}
-  LINK_COMPONENTS
-    Support
-    TargetParser
   )
 
 add_dependencies(lldbPluginProcessGDBRemote
diff --git a/lldb/source/Plugins/Process/mach-core/CMakeLists.txt b/lldb/source/Plugins/Process/mach-core/CMakeLists.txt
index e79cd82..a1ea85e 100644
--- a/lldb/source/Plugins/Process/mach-core/CMakeLists.txt
+++ b/lldb/source/Plugins/Process/mach-core/CMakeLists.txt
@@ -2,6 +2,8 @@ add_lldb_library(lldbPluginProcessMachCore PLUGIN
   ProcessMachCore.cpp
   ThreadMachCore.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbBreakpoint
     lldbCore
@@ -12,6 +14,4 @@ add_lldb_library(lldbPluginProcessMachCore PLUGIN
     lldbPluginDynamicLoaderDarwinKernel
     lldbPluginDynamicLoaderMacOSXDYLD
     lldbPluginObjectFileMachO
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Plugins/Process/minidump/CMakeLists.txt b/lldb/source/Plugins/Process/minidump/CMakeLists.txt
index 9af8168..d685342 100644
--- a/lldb/source/Plugins/Process/minidump/CMakeLists.txt
+++ b/lldb/source/Plugins/Process/minidump/CMakeLists.txt
@@ -8,6 +8,10 @@ add_lldb_library(lldbPluginProcessMinidump PLUGIN
   ProcessMinidump.cpp
   ThreadMinidump.cpp
 
+  LINK_COMPONENTS
+    BinaryFormat
+    Object
+    Support
   LINK_LIBS
     lldbCore
     lldbTarget
@@ -15,8 +19,4 @@ add_lldb_library(lldbPluginProcessMinidump PLUGIN
     lldbPluginProcessUtility
     lldbPluginProcessElfCore
     lldbPluginObjectFilePlaceholder
-  LINK_COMPONENTS
-    BinaryFormat
-    Object
-    Support
   )
diff --git a/lldb/source/Plugins/Process/scripted/CMakeLists.txt b/lldb/source/Plugins/Process/scripted/CMakeLists.txt
index 600ef31..5901665 100644
--- a/lldb/source/Plugins/Process/scripted/CMakeLists.txt
+++ b/lldb/source/Plugins/Process/scripted/CMakeLists.txt
@@ -2,13 +2,13 @@ add_lldb_library(lldbPluginScriptedProcess PLUGIN
   ScriptedProcess.cpp
   ScriptedThread.cpp
 
+  LINK_COMPONENTS
+    BinaryFormat
+    Object
+    Support
   LINK_LIBS
     lldbCore
     lldbTarget
     lldbUtility
     lldbPluginProcessUtility
-  LINK_COMPONENTS
-    BinaryFormat
-    Object
-    Support
   )
diff --git a/lldb/source/Plugins/REPL/Clang/CMakeLists.txt b/lldb/source/Plugins/REPL/Clang/CMakeLists.txt
index b995071..3a7e188 100644
--- a/lldb/source/Plugins/REPL/Clang/CMakeLists.txt
+++ b/lldb/source/Plugins/REPL/Clang/CMakeLists.txt
@@ -1,6 +1,8 @@
 add_lldb_library(lldbPluginClangREPL PLUGIN
   ClangREPL.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbCore
     lldbDataFormatters
@@ -11,7 +13,4 @@ add_lldb_library(lldbPluginClangREPL PLUGIN
     lldbPluginClangCommon
     lldbPluginCPPRuntime
     lldbPluginTypeSystemClang
-
-  LINK_COMPONENTS
-    Support
 )
diff --git a/lldb/source/Plugins/RegisterTypeBuilder/CMakeLists.txt b/lldb/source/Plugins/RegisterTypeBuilder/CMakeLists.txt
index 7abd34a..336ae91 100644
--- a/lldb/source/Plugins/RegisterTypeBuilder/CMakeLists.txt
+++ b/lldb/source/Plugins/RegisterTypeBuilder/CMakeLists.txt
@@ -1,10 +1,9 @@
 add_lldb_library(lldbPluginRegisterTypeBuilderClang PLUGIN
   RegisterTypeBuilderClang.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbCore
     lldbTarget
-
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/CMakeLists.txt b/lldb/source/Plugins/ScriptInterpreter/Python/CMakeLists.txt
index fd3118a..3d09cea 100644
--- a/lldb/source/Plugins/ScriptInterpreter/Python/CMakeLists.txt
+++ b/lldb/source/Plugins/ScriptInterpreter/Python/CMakeLists.txt
@@ -26,6 +26,8 @@ add_lldb_library(lldbPluginScriptInterpreterPython PLUGIN
   PythonReadline.cpp
   ScriptInterpreterPython.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbBreakpoint
     lldbCore
@@ -37,7 +39,4 @@ add_lldb_library(lldbPluginScriptInterpreterPython PLUGIN
     lldbPluginScriptInterpreterPythonInterfaces
     ${Python3_LIBRARIES}
     ${LLDB_LIBEDIT_LIBS}
-
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/CMakeLists.txt b/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/CMakeLists.txt
index ee5e48a..db9e11b 100644
--- a/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/CMakeLists.txt
+++ b/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/CMakeLists.txt
@@ -29,6 +29,8 @@ add_lldb_library(lldbPluginScriptInterpreterPythonInterfaces PLUGIN
   ScriptedThreadPlanPythonInterface.cpp
   ScriptedThreadPythonInterface.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbCore
     lldbHost
@@ -36,9 +38,6 @@ add_lldb_library(lldbPluginScriptInterpreterPythonInterfaces PLUGIN
     lldbTarget
     ${Python3_LIBRARIES}
     ${LLDB_LIBEDIT_LIBS}
-
-  LINK_COMPONENTS
-    Support
   )
 
 
diff --git a/lldb/source/Plugins/SymbolFile/Breakpad/CMakeLists.txt b/lldb/source/Plugins/SymbolFile/Breakpad/CMakeLists.txt
index e93d061..8360a6b 100644
--- a/lldb/source/Plugins/SymbolFile/Breakpad/CMakeLists.txt
+++ b/lldb/source/Plugins/SymbolFile/Breakpad/CMakeLists.txt
@@ -1,12 +1,12 @@
 add_lldb_library(lldbPluginSymbolFileBreakpad PLUGIN
   SymbolFileBreakpad.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbCore
     lldbHost
     lldbSymbol
     lldbUtility
     lldbPluginObjectFileBreakpad
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/CMakeLists.txt b/lldb/source/Plugins/SymbolFile/DWARF/CMakeLists.txt
index 2d2eb73..212cc36 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/CMakeLists.txt
+++ b/lldb/source/Plugins/SymbolFile/DWARF/CMakeLists.txt
@@ -37,6 +37,9 @@ add_lldb_library(lldbPluginSymbolFileDWARF PLUGIN
   SymbolFileDWARFDebugMap.cpp
   UniqueDWARFASTType.cpp
 
+  LINK_COMPONENTS
+    DebugInfoDWARF
+    Support
   LINK_LIBS
     lldbCore
     lldbExpression
@@ -53,9 +56,6 @@ add_lldb_library(lldbPluginSymbolFileDWARF PLUGIN
   CLANG_LIBS
     clangAST
     clangBasic
-  LINK_COMPONENTS
-    DebugInfoDWARF
-    Support
   )
 
 add_dependencies(lldbPluginSymbolFileDWARF
diff --git a/lldb/source/Plugins/SymbolFile/NativePDB/CMakeLists.txt b/lldb/source/Plugins/SymbolFile/NativePDB/CMakeLists.txt
index caef0ee..21756bb 100644
--- a/lldb/source/Plugins/SymbolFile/NativePDB/CMakeLists.txt
+++ b/lldb/source/Plugins/SymbolFile/NativePDB/CMakeLists.txt
@@ -10,6 +10,11 @@ add_lldb_library(lldbPluginSymbolFileNativePDB
   SymbolFileNativePDB.cpp
   UdtRecordCompleter.cpp
 
+  LINK_COMPONENTS
+    DebugInfoCodeView
+    DebugInfoPDB
+    Support
+    TargetParser
   LINK_LIBS
     lldbCore
     lldbSymbol
@@ -19,9 +24,4 @@ add_lldb_library(lldbPluginSymbolFileNativePDB
   CLANG_LIBS
     clangAST
     clangLex
-  LINK_COMPONENTS
-    DebugInfoCodeView
-    DebugInfoPDB
-    Support
-    TargetParser
   )
diff --git a/lldb/source/Plugins/SymbolFile/PDB/CMakeLists.txt b/lldb/source/Plugins/SymbolFile/PDB/CMakeLists.txt
index ceeb173..64590d7 100644
--- a/lldb/source/Plugins/SymbolFile/PDB/CMakeLists.txt
+++ b/lldb/source/Plugins/SymbolFile/PDB/CMakeLists.txt
@@ -3,6 +3,9 @@ add_lldb_library(lldbPluginSymbolFilePDB PLUGIN
   PDBLocationToDWARFExpression.cpp
   SymbolFilePDB.cpp
 
+  LINK_COMPONENTS
+    DebugInfoPDB
+    Support
   LINK_LIBS
     lldbCore
     lldbPluginSymbolFileNativePDB
@@ -12,7 +15,4 @@ add_lldb_library(lldbPluginSymbolFilePDB PLUGIN
   CLANG_LIBS
     clangAST
     clangLex
-  LINK_COMPONENTS
-    DebugInfoPDB
-    Support
   )
diff --git a/lldb/source/Plugins/Trace/intel-pt/CMakeLists.txt b/lldb/source/Plugins/Trace/intel-pt/CMakeLists.txt
index 90f36ed..ddb2f38 100644
--- a/lldb/source/Plugins/Trace/intel-pt/CMakeLists.txt
+++ b/lldb/source/Plugins/Trace/intel-pt/CMakeLists.txt
@@ -35,14 +35,14 @@ add_lldb_library(lldbPluginTraceIntelPT PLUGIN
   TraceIntelPTBundleLoader.cpp
   TraceIntelPTBundleSaver.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbCore
     lldbSymbol
     lldbTarget
     lldbPluginTraceCommon
     ${LIBIPT_LIBRARY}
-  LINK_COMPONENTS
-    Support
   )
 
 
diff --git a/lldb/source/Plugins/TraceExporter/ctf/CMakeLists.txt b/lldb/source/Plugins/TraceExporter/ctf/CMakeLists.txt
index 45a92a4..ea53861 100644
--- a/lldb/source/Plugins/TraceExporter/ctf/CMakeLists.txt
+++ b/lldb/source/Plugins/TraceExporter/ctf/CMakeLists.txt
@@ -6,13 +6,13 @@ add_lldb_library(lldbPluginTraceExporterCTF PLUGIN
 CommandObjectThreadTraceExportCTF.cpp
   TraceExporterCTF.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbCore
     lldbSymbol
     lldbTarget
     lldbPluginTraceExporterCommon
-  LINK_COMPONENTS
-    Support
   )
 
 add_dependencies(lldbPluginTraceExporterCTF TraceExporterCTFOptionsGen)
diff --git a/lldb/source/Plugins/TypeSystem/Clang/CMakeLists.txt b/lldb/source/Plugins/TypeSystem/Clang/CMakeLists.txt
index 37a3142..90f173b 100644
--- a/lldb/source/Plugins/TypeSystem/Clang/CMakeLists.txt
+++ b/lldb/source/Plugins/TypeSystem/Clang/CMakeLists.txt
@@ -1,6 +1,8 @@
 add_lldb_library(lldbPluginTypeSystemClang PLUGIN
   TypeSystemClang.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbCore
     lldbSymbol
@@ -15,6 +17,4 @@ add_lldb_library(lldbPluginTypeSystemClang PLUGIN
     clangBasic
     clangFrontend
     clangSema
-  LINK_COMPONENTS
-    Support
 )
diff --git a/lldb/source/Plugins/UnwindAssembly/x86/CMakeLists.txt b/lldb/source/Plugins/UnwindAssembly/x86/CMakeLists.txt
index 425ae11..199d1da 100644
--- a/lldb/source/Plugins/UnwindAssembly/x86/CMakeLists.txt
+++ b/lldb/source/Plugins/UnwindAssembly/x86/CMakeLists.txt
@@ -2,13 +2,13 @@ add_lldb_library(lldbPluginUnwindAssemblyX86 PLUGIN
   UnwindAssembly-x86.cpp
   x86AssemblyInspectionEngine.cpp
 
+  LINK_COMPONENTS
+    Support
+    MC
+    MCDisassembler
   LINK_LIBS
     lldbCore
     lldbSymbol
     lldbTarget
     lldbUtility
-  LINK_COMPONENTS
-    Support
-    MC
-    MCDisassembler
   )
diff --git a/lldb/source/Symbol/CMakeLists.txt b/lldb/source/Symbol/CMakeLists.txt
index 86fa858..f484304 100644
--- a/lldb/source/Symbol/CMakeLists.txt
+++ b/lldb/source/Symbol/CMakeLists.txt
@@ -33,6 +33,8 @@ add_lldb_library(lldbSymbol NO_PLUGIN_DEPENDENCIES
   Variable.cpp
   VariableList.cpp
 
+  LINK_COMPONENTS
+    Support
   LINK_LIBS
     lldbCore
     lldbExpression
@@ -40,7 +42,4 @@ add_lldb_library(lldbSymbol NO_PLUGIN_DEPENDENCIES
     lldbTarget
     lldbUtility
     lldbValueObject
-
-  LINK_COMPONENTS
-    Support
   )
diff --git a/lldb/source/Target/CMakeLists.txt b/lldb/source/Target/CMakeLists.txt
index d354591..5d40f32 100644
--- a/lldb/source/Target/CMakeLists.txt
+++ b/lldb/source/Target/CMakeLists.txt
@@ -82,6 +82,9 @@ add_lldb_library(lldbTarget
   UnwindLLDB.cpp
   VerboseTrapFrameRecognizer.cpp
 
+  LINK_COMPONENTS
+    Support
+    MC
   LINK_LIBS
     lldbBreakpoint
     lldbCore
@@ -92,10 +95,6 @@ add_lldb_library(lldbTarget
     lldbUtility
     lldbValueObject
     lldbPluginProcessUtility
-
-  LINK_COMPONENTS
-    Support
-    MC
   )
 
 add_dependencies(lldbTarget
diff --git a/lldb/source/Utility/CMakeLists.txt b/lldb/source/Utility/CMakeLists.txt
index 6954a25..5732d97 100644
--- a/lldb/source/Utility/CMakeLists.txt
+++ b/lldb/source/Utility/CMakeLists.txt
@@ -81,12 +81,11 @@ add_lldb_library(lldbUtility NO_INTERNAL_DEPENDENCIES
   XcodeSDK.cpp
   ZipFile.cpp
 
-  LINK_LIBS
-    ${LLDB_SYSTEM_LIBS}
-    # lldbUtility does not depend on other LLDB libraries
-
   LINK_COMPONENTS
     BinaryFormat
     Support
     TargetParser
+  LINK_LIBS
+    ${LLDB_SYSTEM_LIBS}
+    # lldbUtility does not depend on other LLDB libraries
   )
diff --git a/lldb/source/ValueObject/CMakeLists.txt b/lldb/source/ValueObject/CMakeLists.txt
index 9268391..a6f9ffb 100644
--- a/lldb/source/ValueObject/CMakeLists.txt
+++ b/lldb/source/ValueObject/CMakeLists.txt
@@ -19,7 +19,10 @@ add_lldb_library(lldbValueObject
   ValueObjectVariable.cpp
   ValueObjectVTable.cpp
 
-
+  LINK_COMPONENTS
+    Support
+    Demangle
+    TargetParser
   LINK_LIBS
     lldbBreakpoint
     lldbDataFormatters
@@ -31,9 +34,4 @@ add_lldb_library(lldbValueObject
     lldbUtility
     lldbPluginCPlusPlusLanguage
     lldbPluginObjCLanguage
-
-  LINK_COMPONENTS
-    Support
-    Demangle
-    TargetParser
   )