diff --git a/lib/ARCMigrate/CMakeLists.txt b/lib/ARCMigrate/CMakeLists.txt
index 0bfdb6c13694886a1a19d2e9f27ad5cb10475c7b..e5ec607d73f70d4b8c8217a72ac307147a1e8d8e 100644
--- a/lib/ARCMigrate/CMakeLists.txt
+++ b/lib/ARCMigrate/CMakeLists.txt
@@ -23,9 +23,8 @@ add_clang_library(clangARCMigrate
   TransZeroOutPropsInDealloc.cpp
   TransformActions.cpp
   Transforms.cpp
-  )
 
-target_link_libraries(clangARCMigrate
+  LINK_LIBS
   clangAST
   clangAnalysis
   clangBasic
diff --git a/lib/AST/CMakeLists.txt b/lib/AST/CMakeLists.txt
index 1da3ac671293017a941cddb1ee1505dcbb381dbe..9006be64f73fd6cf34580a702297c372634f68ca 100644
--- a/lib/AST/CMakeLists.txt
+++ b/lib/AST/CMakeLists.txt
@@ -57,9 +57,8 @@ add_clang_library(clangAST
   TypePrinter.cpp
   VTableBuilder.cpp
   VTTBuilder.cpp
-  )
 
-target_link_libraries(clangAST
+  LINK_LIBS
   clangBasic
   clangLex
   )
diff --git a/lib/ASTMatchers/CMakeLists.txt b/lib/ASTMatchers/CMakeLists.txt
index e2a8fc5020df63302228d2a265e67fc783092e99..8a8e8c36569f9aafcdcae4c284852145077a0268 100644
--- a/lib/ASTMatchers/CMakeLists.txt
+++ b/lib/ASTMatchers/CMakeLists.txt
@@ -5,8 +5,7 @@ set(LLVM_LINK_COMPONENTS support)
 add_clang_library(clangASTMatchers
   ASTMatchFinder.cpp
   ASTMatchersInternal.cpp
-  )
 
-target_link_libraries(clangASTMatchers
+  LINK_LIBS
   clangAST
   )
diff --git a/lib/ASTMatchers/Dynamic/CMakeLists.txt b/lib/ASTMatchers/Dynamic/CMakeLists.txt
index b28b2ec2ffdaa753ab5a6b35f1f3da726eca87a2..c0d80adaac0b85905803da169ba7d8df06ec26b9 100644
--- a/lib/ASTMatchers/Dynamic/CMakeLists.txt
+++ b/lib/ASTMatchers/Dynamic/CMakeLists.txt
@@ -5,9 +5,8 @@ add_clang_library(clangDynamicASTMatchers
   VariantValue.cpp
   Parser.cpp
   Registry.cpp
-  )
 
-target_link_libraries(clangDynamicASTMatchers
+  LINK_LIBS
   clangAST
   clangASTMatchers
   clangBasic
diff --git a/lib/Analysis/CMakeLists.txt b/lib/Analysis/CMakeLists.txt
index 231db95f38d03e8f6d530ad353ff35c9c3dc36f1..9630bc0be0a6f5c32d903cf02e2c01459b9dd526 100644
--- a/lib/Analysis/CMakeLists.txt
+++ b/lib/Analysis/CMakeLists.txt
@@ -24,9 +24,8 @@ add_clang_library(clangAnalysis
   ScanfFormatString.cpp
   ThreadSafety.cpp
   UninitializedValues.cpp
-  )
 
-target_link_libraries(clangAnalysis
+  LINK_LIBS
   clangBasic
   clangAST
   )
diff --git a/lib/CodeGen/CMakeLists.txt b/lib/CodeGen/CMakeLists.txt
index 5890736b182d2f59eba35086cc3bd196f398c5c2..12cb1ab25598f3b48825f280fa226af6dbc2f950 100644
--- a/lib/CodeGen/CMakeLists.txt
+++ b/lib/CodeGen/CMakeLists.txt
@@ -61,9 +61,8 @@ add_clang_library(clangCodeGen
 
   DEPENDS
   intrinsics_gen
-  )
 
-target_link_libraries(clangCodeGen
+  LINK_LIBS
   clangBasic
   clangAST
   clangFrontend
diff --git a/lib/Driver/CMakeLists.txt b/lib/Driver/CMakeLists.txt
index 9468601d40aca9aa9698078fd1a1cff43c0644a1..f2bdaee79285340b52af27259ffed8a2af14682b 100644
--- a/lib/Driver/CMakeLists.txt
+++ b/lib/Driver/CMakeLists.txt
@@ -24,8 +24,7 @@ add_clang_library(clangDriver
   DEPENDS
   ClangCC1AsOptions
   ClangDriverOptions
-  )
 
-target_link_libraries(clangDriver
+  LINK_LIBS
   clangBasic
   )
diff --git a/lib/Edit/CMakeLists.txt b/lib/Edit/CMakeLists.txt
index b81f8a95cf3ed4d7041514f8e8d8be9b322c4c0b..08495f89c35b2407ce3c16a2aa305549151f53ee 100644
--- a/lib/Edit/CMakeLists.txt
+++ b/lib/Edit/CMakeLists.txt
@@ -6,9 +6,8 @@ add_clang_library(clangEdit
   Commit.cpp
   EditedSource.cpp
   RewriteObjCFoundationAPI.cpp
-  )
 
-target_link_libraries(clangEdit
+  LINK_LIBS
   clangBasic
   clangAST
   clangLex
diff --git a/lib/Format/CMakeLists.txt b/lib/Format/CMakeLists.txt
index e87c9401027a728352b257c99a4f1d0e5e76d400..47e15bd08a3f9fb0527accc8e8d73c9e7d42f709 100644
--- a/lib/Format/CMakeLists.txt
+++ b/lib/Format/CMakeLists.txt
@@ -8,9 +8,8 @@ add_clang_library(clangFormat
   TokenAnnotator.cpp
   UnwrappedLineParser.cpp
   WhitespaceManager.cpp
-  )
 
-target_link_libraries(clangFormat
+  LINK_LIBS
   clangBasic
   clangLex
   clangTooling
diff --git a/lib/Frontend/CMakeLists.txt b/lib/Frontend/CMakeLists.txt
index 8e11e6f09d5e6ddde3d7e5d7950403da812ce2ee..f1c789778f1f7641f103e1c2f7df3108f7784659 100644
--- a/lib/Frontend/CMakeLists.txt
+++ b/lib/Frontend/CMakeLists.txt
@@ -36,9 +36,8 @@ add_clang_library(clangFrontend
 
   DEPENDS
   ClangDriverOptions
-  )
 
-target_link_libraries(clangFrontend
+  LINK_LIBS
   clangAST
   clangBasic
   clangDriver
diff --git a/lib/FrontendTool/CMakeLists.txt b/lib/FrontendTool/CMakeLists.txt
index 63b6e9b7df4073ba1d1d9c56ac50cefb8176598f..7e11be0ce4c5832f0d77282192b526e610871e7b 100644
--- a/lib/FrontendTool/CMakeLists.txt
+++ b/lib/FrontendTool/CMakeLists.txt
@@ -3,14 +3,7 @@ set(LLVM_LINK_COMPONENTS
   Support
   )
 
-add_clang_library(clangFrontendTool
-  ExecuteCompilerInvocation.cpp
-
-  DEPENDS
-  ClangDriverOptions
-  )
-
-target_link_libraries(clangFrontendTool
+set(link_libs
   clangBasic
   clangCodeGen
   clangDriver
@@ -19,13 +12,23 @@ target_link_libraries(clangFrontendTool
   )
 
 if(CLANG_ENABLE_ARCMT)
-  target_link_libraries(clangFrontendTool
+  list(APPEND link_libs
     clangARCMigrate
     )
 endif()
 
 if(CLANG_ENABLE_STATIC_ANALYZER)
-  target_link_libraries(clangFrontendTool
+  list(APPEND link_libs
     clangStaticAnalyzerFrontend
     )
 endif()
+
+add_clang_library(clangFrontendTool
+  ExecuteCompilerInvocation.cpp
+
+  DEPENDS
+  ClangDriverOptions
+
+  LINK_LIBS
+  ${link_libs}
+  )
diff --git a/lib/Index/CMakeLists.txt b/lib/Index/CMakeLists.txt
index e9da8e591dbfb3fc2f392754ee90ed3615436ee2..fd9810d699ca244e46ff17c4d124f9d9f67cddab 100644
--- a/lib/Index/CMakeLists.txt
+++ b/lib/Index/CMakeLists.txt
@@ -8,9 +8,8 @@ add_clang_library(clangIndex
 
   ADDITIONAL_HEADERS
   SimpleFormatContext.h
-  )
 
-target_link_libraries(clangIndex
+  LINK_LIBS
   clangAST
   clangBasic
   clangFormat
diff --git a/lib/Lex/CMakeLists.txt b/lib/Lex/CMakeLists.txt
index f5050179b1e6b8465e4f02494bec5096aba03a3d..38df144adf9abc5cf13a7710dff32dc2026f54da 100644
--- a/lib/Lex/CMakeLists.txt
+++ b/lib/Lex/CMakeLists.txt
@@ -25,8 +25,7 @@ add_clang_library(clangLex
   ScratchBuffer.cpp
   TokenConcatenation.cpp
   TokenLexer.cpp
-  )
 
-target_link_libraries(clangLex
+  LINK_LIBS
   clangBasic
   )
diff --git a/lib/Parse/CMakeLists.txt b/lib/Parse/CMakeLists.txt
index 43500bfaa605e41a47ef935c34cdf58d816bb1ee..10b146fd1873e767b32e009884685638f31cf929 100644
--- a/lib/Parse/CMakeLists.txt
+++ b/lib/Parse/CMakeLists.txt
@@ -19,9 +19,8 @@ add_clang_library(clangParse
   ParseTemplate.cpp
   ParseTentative.cpp
   Parser.cpp
-  )
 
-target_link_libraries(clangParse
+  LINK_LIBS
   clangBasic
   clangAST
   clangLex
diff --git a/lib/Rewrite/Core/CMakeLists.txt b/lib/Rewrite/Core/CMakeLists.txt
index 6e9505fd9f211803bcb5f36d22d08e130db2c54e..896382c36dbda5eb31f61096ed264905376ee0cd 100644
--- a/lib/Rewrite/Core/CMakeLists.txt
+++ b/lib/Rewrite/Core/CMakeLists.txt
@@ -8,9 +8,8 @@ add_clang_library(clangRewriteCore
   RewriteRope.cpp
   Rewriter.cpp
   TokenRewriter.cpp
-  )
 
-target_link_libraries(clangRewriteCore
+  LINK_LIBS
   clangAST
   clangBasic
   clangLex
diff --git a/lib/Rewrite/Frontend/CMakeLists.txt b/lib/Rewrite/Frontend/CMakeLists.txt
index c1146181f340076c2a77c8b6d179e46e9f1b3b67..85af97d343d2bc2cc48ae0c07a7bf41c072a23d7 100644
--- a/lib/Rewrite/Frontend/CMakeLists.txt
+++ b/lib/Rewrite/Frontend/CMakeLists.txt
@@ -11,9 +11,8 @@ add_clang_library(clangRewriteFrontend
   RewriteModernObjC.cpp
   RewriteObjC.cpp
   RewriteTest.cpp
-  )
 
-target_link_libraries(clangRewriteFrontend
+  LINK_LIBS
   clangAST
   clangBasic
   clangEdit
diff --git a/lib/Sema/CMakeLists.txt b/lib/Sema/CMakeLists.txt
index 1c16f0f987fdd9f73d59dd05aa0ba5b8a1edfbd0..7847d2c36e5b11da9cfef99facc2a9523e044dee 100644
--- a/lib/Sema/CMakeLists.txt
+++ b/lib/Sema/CMakeLists.txt
@@ -48,9 +48,8 @@ add_clang_library(clangSema
   SemaTemplateVariadic.cpp
   SemaType.cpp
   TypeLocBuilder.cpp
-  )
 
-target_link_libraries(clangSema
+  LINK_LIBS
   clangAST
   clangAnalysis
   clangBasic
diff --git a/lib/Serialization/CMakeLists.txt b/lib/Serialization/CMakeLists.txt
index cd7082006dceb3775ecd83edee75b78ecddcb30e..d885db22975e38cff8c970c631c900282f00391d 100644
--- a/lib/Serialization/CMakeLists.txt
+++ b/lib/Serialization/CMakeLists.txt
@@ -20,9 +20,8 @@ add_clang_library(clangSerialization
   ADDITIONAL_HEADERS
   ASTCommon.h
   ASTReaderInternals.h
-  )
 
-target_link_libraries(clangSerialization
+  LINK_LIBS
   clangAST
   clangBasic
   clangLex
diff --git a/lib/StaticAnalyzer/Checkers/CMakeLists.txt b/lib/StaticAnalyzer/Checkers/CMakeLists.txt
index b231864123a77414cf0cb0a0da9bc727bb65bcd4..8e7a83913390c7137b379dff32471c0be3a5337d 100644
--- a/lib/StaticAnalyzer/Checkers/CMakeLists.txt
+++ b/lib/StaticAnalyzer/Checkers/CMakeLists.txt
@@ -77,9 +77,8 @@ add_clang_library(clangStaticAnalyzerCheckers
 
   DEPENDS
   ClangSACheckers
-  )
 
-target_link_libraries(clangStaticAnalyzerCheckers
+  LINK_LIBS
   clangAST
   clangAnalysis
   clangBasic
diff --git a/lib/StaticAnalyzer/Core/CMakeLists.txt b/lib/StaticAnalyzer/Core/CMakeLists.txt
index 89c0be138d3bcb37d9d206ef79f95edae4935472..3a00131ce1278741c1a8e55130ce4cf981034ee9 100644
--- a/lib/StaticAnalyzer/Core/CMakeLists.txt
+++ b/lib/StaticAnalyzer/Core/CMakeLists.txt
@@ -39,9 +39,8 @@ add_clang_library(clangStaticAnalyzerCore
   Store.cpp
   SubEngine.cpp
   SymbolManager.cpp
-  )
 
-target_link_libraries(clangStaticAnalyzerCore
+  LINK_LIBS
   clangAST
   clangAnalysis
   clangBasic
diff --git a/lib/StaticAnalyzer/Frontend/CMakeLists.txt b/lib/StaticAnalyzer/Frontend/CMakeLists.txt
index 4df4556648c75c944e64920306e074cad8f23a9e..5349ed93e2c4134a8e5acd401a219c7776364d3a 100644
--- a/lib/StaticAnalyzer/Frontend/CMakeLists.txt
+++ b/lib/StaticAnalyzer/Frontend/CMakeLists.txt
@@ -8,9 +8,8 @@ add_clang_library(clangStaticAnalyzerFrontend
   AnalysisConsumer.cpp
   CheckerRegistration.cpp
   FrontendActions.cpp
-  )
 
-target_link_libraries(clangStaticAnalyzerFrontend
+  LINK_LIBS
   clangAST
   clangAnalysis
   clangBasic
diff --git a/lib/Tooling/CMakeLists.txt b/lib/Tooling/CMakeLists.txt
index 83c71b6c1e1cc4ba6bfe9010ba759940fd64933e..a1bf964faf34ed34fb72918d75b025a51df0652b 100644
--- a/lib/Tooling/CMakeLists.txt
+++ b/lib/Tooling/CMakeLists.txt
@@ -9,9 +9,8 @@ add_clang_library(clangTooling
   Refactoring.cpp
   RefactoringCallbacks.cpp
   Tooling.cpp
-  )
 
-target_link_libraries(clangTooling
+  LINK_LIBS
   clangAST
   clangASTMatchers
   clangBasic