Index: lld/trunk/cmake/modules/AddLLD.cmake
===================================================================
--- lld/trunk/cmake/modules/AddLLD.cmake
+++ lld/trunk/cmake/modules/AddLLD.cmake
@@ -1,5 +1,5 @@
 macro(add_lld_library name)
-  add_llvm_library(${name} ${ARGN})
+  llvm_add_library(${name} ${ARGN})
   set_target_properties(${name} PROPERTIES FOLDER "lld libraries")
 endmacro(add_lld_library)
 
Index: lld/trunk/lib/Config/CMakeLists.txt
===================================================================
--- lld/trunk/lib/Config/CMakeLists.txt
+++ lld/trunk/lib/Config/CMakeLists.txt
@@ -4,6 +4,6 @@
   ADDITIONAL_HEADER_DIRS
   ${LLD_INCLUDE_DIR}/lld/Config
 
-  LINK_LIBS
-    LLVMSupport
+  LINK_COMPONENTS
+    Support
   )
Index: lld/trunk/lib/Core/CMakeLists.txt
===================================================================
--- lld/trunk/lib/Core/CMakeLists.txt
+++ lld/trunk/lib/Core/CMakeLists.txt
@@ -12,6 +12,6 @@
   ADDITIONAL_HEADER_DIRS
   ${LLD_INCLUDE_DIR}/lld/Core
 
-  LINK_LIBS
-    LLVMSupport
+  LINK_COMPONENTS
+    Support
   )
Index: lld/trunk/lib/Driver/CMakeLists.txt
===================================================================
--- lld/trunk/lib/Driver/CMakeLists.txt
+++ lld/trunk/lib/Driver/CMakeLists.txt
@@ -8,15 +8,17 @@
   ADDITIONAL_HEADER_DIRS
   ${LLD_INCLUDE_DIR}/lld/Driver
 
+  LINK_COMPONENTS
+    Object
+    Option
+    Support
+
   LINK_LIBS
     lldConfig
     lldMachO
     lldCore
     lldReaderWriter
     lldYAML
-    LLVMObject
-    LLVMOption
-    LLVMSupport
   )
 
 add_dependencies(lldDriver DriverOptionsTableGen)
Index: lld/trunk/lib/ReaderWriter/CMakeLists.txt
===================================================================
--- lld/trunk/lib/ReaderWriter/CMakeLists.txt
+++ lld/trunk/lib/ReaderWriter/CMakeLists.txt
@@ -11,9 +11,11 @@
   ADDITIONAL_HEADER_DIRS
   ${LLD_INCLUDE_DIR}/lld/ReaderWriter
 
+  LINK_COMPONENTS
+    Object
+    Support
+
   LINK_LIBS
     lldCore
     lldYAML
-    LLVMObject
-    LLVMSupport
   )
Index: lld/trunk/lib/ReaderWriter/MachO/CMakeLists.txt
===================================================================
--- lld/trunk/lib/ReaderWriter/MachO/CMakeLists.txt
+++ lld/trunk/lib/ReaderWriter/MachO/CMakeLists.txt
@@ -18,13 +18,16 @@
   StubsPass.cpp
   TLVPass.cpp
   WriterMachO.cpp
+
+  LINK_COMPONENTS
+    DebugInfoDWARF
+    Object
+    Support
+    Demangle
+
   LINK_LIBS
     lldCore
     lldYAML
-    LLVMDebugInfoDWARF
-    LLVMObject
-    LLVMSupport
-    LLVMDemangle
     ${PTHREAD_LIB}
   )
 
Index: lld/trunk/lib/ReaderWriter/YAML/CMakeLists.txt
===================================================================
--- lld/trunk/lib/ReaderWriter/YAML/CMakeLists.txt
+++ lld/trunk/lib/ReaderWriter/YAML/CMakeLists.txt
@@ -1,6 +1,9 @@
 add_lld_library(lldYAML
   ReaderWriterYAML.cpp
+
+  LINK_COMPONENTS
+    Support
+
   LINK_LIBS
     lldCore
-    LLVMSupport
   )
Index: lld/trunk/tools/lld/CMakeLists.txt
===================================================================
--- lld/trunk/tools/lld/CMakeLists.txt
+++ lld/trunk/tools/lld/CMakeLists.txt
@@ -1,3 +1,7 @@
+set(LLVM_LINK_COMPONENTS
+  Support
+  )
+
 add_lld_tool(lld
   lld.cpp
   )
@@ -6,7 +10,6 @@
   lldDriver
   lldCOFF
   lldELF
-  LLVMSupport
   )
 
 install(TARGETS lld