diff --git a/clang/tools/clang-shlib/CMakeLists.txt b/clang/tools/clang-shlib/CMakeLists.txt
index 16fc8a0ca29b29..a0fc8f6bfbdeeb 100644
--- a/clang/tools/clang-shlib/CMakeLists.txt
+++ b/clang/tools/clang-shlib/CMakeLists.txt
@@ -14,17 +14,9 @@ foreach (lib ${clang_libs})
     list(APPEND _OBJECTS $<TARGET_OBJECTS:obj.${lib}>)
   endif()
   list(APPEND _DEPS $<TARGET_PROPERTY:${lib},INTERFACE_LINK_LIBRARIES>)
-  get_target_property(interface ${lib} LINK_LIBRARIES)
-  if (interface)
-    list(APPEND _DEPS ${interface})
-  endif()
+  list(APPEND _DEPS $<TARGET_PROPERTY:${lib},LINK_LIBRARIES>)
 endforeach ()
 
-# clang libraries are redundant since we are linking all the individual
-# object files into libclang-cpp.so, so filter them out from _DEPS.
-# This avoids problems with LLVM global data when building with
-# BUILD_SHARED_LIBS=ON
-list(FILTER _DEPS EXCLUDE REGEX "^clang")
 if (CLANG_LINK_CLANG_DYLIB)
   set(INSTALL_WITH_TOOLCHAIN INSTALL_WITH_TOOLCHAIN)
 endif()