diff --git a/clang/tools/c-index-test/CMakeLists.txt b/clang/tools/c-index-test/CMakeLists.txt

index 24e7c96..3b38a22 100644

--- a/clang/tools/c-index-test/CMakeLists.txt

+++ b/clang/tools/c-index-test/CMakeLists.txt

@@ -18,6 +18,9 @@ if (LLVM_BUILD_STATIC)

   target_link_libraries(c-index-test

     PRIVATE

     libclang_static

+  )

+  clang_target_link_libraries(c-index-test

+    PRIVATE

     clangCodeGen

     clangIndex

   )

@@ -25,6 +28,9 @@ else()

   target_link_libraries(c-index-test

     PRIVATE

     libclang

+  )

+  clang_target_link_libraries(c-index-test

+    PRIVATE

     clangAST

     clangBasic

     clangFrontend

diff --git a/clang/tools/libclang/CMakeLists.txt b/clang/tools/libclang/CMakeLists.txt

index 4f23065..343f977 100644

--- a/clang/tools/libclang/CMakeLists.txt

+++ b/clang/tools/libclang/CMakeLists.txt

@@ -57,7 +57,7 @@ set(SOURCES

   ../../include/clang-c/Index.h

   )

-set(LIBS

+set(CLANG_LIB_DEPS

   clangAST

   clangBasic

   clangDriver

@@ -72,7 +72,7 @@ set(LIBS

 )

 if (CLANG_ENABLE_ARCMT)

-  list(APPEND LIBS clangARCMigrate)

+  list(APPEND CLANG_LIB_DEPS clangARCMigrate)

 endif ()

 if (HAVE_LIBDL)

@@ -152,6 +152,11 @@ add_clang_library(libclang ${ENABLE_SHARED} ${ENABLE_STATIC} INSTALL_WITH_TOOLCH

   TargetParser

   )

+clang_target_link_libraries(libclang

+  PRIVATE

+  ${CLANG_LIB_DEPS}

+  )

+

 if(ENABLE_STATIC)

   foreach(name libclang obj.libclang libclang_static)

     if (TARGET ${name})

​