12 files changed, 12 insertions, 12 deletions
diff --git a/clang/tools/arcmt-test/CMakeLists.txt b/clang/tools/arcmt-test/CMakeLists.txt
index c4c1463241b..d3e6580e16e 100644
--- a/clang/tools/arcmt-test/CMakeLists.txt
+++ b/clang/tools/arcmt-test/CMakeLists.txt
@@ -6,7 +6,7 @@ add_clang_executable(arcmt-test
   arcmt-test.cpp
   )
 
-target_link_libraries(arcmt-test
+clang_target_link_libraries(arcmt-test
   PRIVATE
   clangARCMigrate
   clangBasic
diff --git a/clang/tools/clang-check/CMakeLists.txt b/clang/tools/clang-check/CMakeLists.txt
index b837b0a0a5d..4576d78bcfb 100644
--- a/clang/tools/clang-check/CMakeLists.txt
+++ b/clang/tools/clang-check/CMakeLists.txt
@@ -8,7 +8,7 @@ add_clang_executable(clang-check
   ClangCheck.cpp
   )
 
-target_link_libraries(clang-check
+clang_target_link_libraries(clang-check
   PRIVATE
   clangAST
   clangBasic
diff --git a/clang/tools/clang-diff/CMakeLists.txt b/clang/tools/clang-diff/CMakeLists.txt
index ab9a5bbbe91..41f61fe968f 100644
--- a/clang/tools/clang-diff/CMakeLists.txt
+++ b/clang/tools/clang-diff/CMakeLists.txt
@@ -6,7 +6,7 @@ add_clang_executable(clang-diff
   ClangDiff.cpp
   )
 
-target_link_libraries(clang-diff
+clang_target_link_libraries(clang-diff
   PRIVATE
   clangBasic
   clangFrontend
diff --git a/clang/tools/clang-extdef-mapping/CMakeLists.txt b/clang/tools/clang-extdef-mapping/CMakeLists.txt
index 6c81689a831..4798bdb71ad 100644
--- a/clang/tools/clang-extdef-mapping/CMakeLists.txt
+++ b/clang/tools/clang-extdef-mapping/CMakeLists.txt
@@ -7,7 +7,7 @@ add_clang_executable(clang-extdef-mapping
   ClangExtDefMapGen.cpp
   )
 
-target_link_libraries(clang-extdef-mapping
+clang_target_link_libraries(clang-extdef-mapping
   PRIVATE
   clangAST
   clangBasic
diff --git a/clang/tools/clang-format/CMakeLists.txt b/clang/tools/clang-format/CMakeLists.txt
index a295e8cd0b2..35ecdb11253 100644
--- a/clang/tools/clang-format/CMakeLists.txt
+++ b/clang/tools/clang-format/CMakeLists.txt
@@ -11,7 +11,7 @@ set(CLANG_FORMAT_LIB_DEPS
   clangToolingCore
   )
 
-target_link_libraries(clang-format
+clang_target_link_libraries(clang-format
   PRIVATE
   ${CLANG_FORMAT_LIB_DEPS}
   )
diff --git a/clang/tools/clang-import-test/CMakeLists.txt b/clang/tools/clang-import-test/CMakeLists.txt
index ee1bdab64a5..39a5c41c151 100644
--- a/clang/tools/clang-import-test/CMakeLists.txt
+++ b/clang/tools/clang-import-test/CMakeLists.txt
@@ -24,7 +24,7 @@ set(CLANG_IMPORT_TEST_LIB_DEPS
   clangSerialization
   )
 
-target_link_libraries(clang-import-test
+clang_target_link_libraries(clang-import-test
   PRIVATE
   ${CLANG_IMPORT_TEST_LIB_DEPS}
   )
diff --git a/clang/tools/clang-offload-bundler/CMakeLists.txt b/clang/tools/clang-offload-bundler/CMakeLists.txt
index 8718015be76..465bef040a6 100644
--- a/clang/tools/clang-offload-bundler/CMakeLists.txt
+++ b/clang/tools/clang-offload-bundler/CMakeLists.txt
@@ -17,7 +17,7 @@ set(CLANG_OFFLOAD_BUNDLER_LIB_DEPS
   
 add_dependencies(clang clang-offload-bundler)
 
-target_link_libraries(clang-offload-bundler
+clang_target_link_libraries(clang-offload-bundler
   PRIVATE
   ${CLANG_OFFLOAD_BUNDLER_LIB_DEPS}
   )
diff --git a/clang/tools/clang-refactor/CMakeLists.txt b/clang/tools/clang-refactor/CMakeLists.txt
index 5340d7e9b20..a21d84d5385 100644
--- a/clang/tools/clang-refactor/CMakeLists.txt
+++ b/clang/tools/clang-refactor/CMakeLists.txt
@@ -8,7 +8,7 @@ add_clang_tool(clang-refactor
   TestSupport.cpp
   )
 
-target_link_libraries(clang-refactor
+clang_target_link_libraries(clang-refactor
   PRIVATE
   clangAST
   clangBasic
diff --git a/clang/tools/clang-rename/CMakeLists.txt b/clang/tools/clang-rename/CMakeLists.txt
index 1abf7ed4e82..cda8e29ec5b 100644
--- a/clang/tools/clang-rename/CMakeLists.txt
+++ b/clang/tools/clang-rename/CMakeLists.txt
@@ -7,7 +7,7 @@ add_clang_tool(clang-rename
   ClangRename.cpp
   )
 
-target_link_libraries(clang-rename
+clang_target_link_libraries(clang-rename
   PRIVATE
   clangBasic
   clangFrontend
diff --git a/clang/tools/clang-scan-deps/CMakeLists.txt b/clang/tools/clang-scan-deps/CMakeLists.txt
index 5cb4e6ff320..6aa914f3b25 100644
--- a/clang/tools/clang-scan-deps/CMakeLists.txt
+++ b/clang/tools/clang-scan-deps/CMakeLists.txt
@@ -21,7 +21,7 @@ set(CLANG_SCAN_DEPS_LIB_DEPS
   clangDependencyScanning
   )
 
-target_link_libraries(clang-scan-deps
+clang_target_link_libraries(clang-scan-deps
   PRIVATE
   ${CLANG_SCAN_DEPS_LIB_DEPS}
   )
diff --git a/clang/tools/diagtool/CMakeLists.txt b/clang/tools/diagtool/CMakeLists.txt
index 80d787b12fd..a95444be40e 100644
--- a/clang/tools/diagtool/CMakeLists.txt
+++ b/clang/tools/diagtool/CMakeLists.txt
@@ -12,7 +12,7 @@ add_clang_executable(diagtool
   TreeView.cpp
 )
 
-target_link_libraries(diagtool
+clang_target_link_libraries(diagtool
   PRIVATE
   clangBasic
   clangFrontend
diff --git a/clang/tools/driver/CMakeLists.txt b/clang/tools/driver/CMakeLists.txt
index 30ab163a6cc..590d708d837 100644
--- a/clang/tools/driver/CMakeLists.txt
+++ b/clang/tools/driver/CMakeLists.txt
@@ -39,7 +39,7 @@ add_clang_tool(clang
   ${tablegen_deps}
   )
 
-target_link_libraries(clang
+clang_target_link_libraries(clang
   PRIVATE
   clangBasic
   clangCodeGen