Index: llvm/lib/ExecutionEngine/CMakeLists.txt
===================================================================
--- llvm/lib/ExecutionEngine/CMakeLists.txt
+++ llvm/lib/ExecutionEngine/CMakeLists.txt
@@ -22,10 +22,6 @@
   Target
   )
 
-if(BUILD_SHARED_LIBS)
-  target_link_libraries(LLVMExecutionEngine PUBLIC LLVMRuntimeDyld)
-endif()
-
 add_subdirectory(Interpreter)
 add_subdirectory(JITLink)
 add_subdirectory(MCJIT)
Index: llvm/lib/ExecutionEngine/JITLink/CMakeLists.txt
===================================================================
--- llvm/lib/ExecutionEngine/JITLink/CMakeLists.txt
+++ llvm/lib/ExecutionEngine/JITLink/CMakeLists.txt
@@ -24,10 +24,3 @@
   OrcTargetProcess
   Support
   )
- 
-target_link_libraries(LLVMJITLink
-  PRIVATE
-  LLVMObject
-  LLVMOrcTargetProcess
-  LLVMSupport
-)
Index: llvm/lib/ExecutionEngine/Orc/CMakeLists.txt
===================================================================
--- llvm/lib/ExecutionEngine/Orc/CMakeLists.txt
+++ llvm/lib/ExecutionEngine/Orc/CMakeLists.txt
@@ -32,6 +32,9 @@
   intrinsics_gen
 
   LINK_COMPONENTS
+  Analysis
+  BitReader
+  BitWriter
   Core
   ExecutionEngine
   JITLink
@@ -48,11 +51,3 @@
 
 add_subdirectory(Shared)
 add_subdirectory(TargetProcess)
-
-target_link_libraries(LLVMOrcJIT
-  PRIVATE
-  LLVMAnalysis
-  LLVMBitReader
-  LLVMBitWriter
-  LLVMPasses
-  )
Index: llvm/lib/FileCheck/CMakeLists.txt
===================================================================
--- llvm/lib/FileCheck/CMakeLists.txt
+++ llvm/lib/FileCheck/CMakeLists.txt
@@ -3,6 +3,7 @@
 
   ADDITIONAL_HEADER_DIRS
   "${LLVM_MAIN_INCLUDE_DIR}/llvm/FileCheck"
-)
 
-target_link_libraries(LLVMFileCheck LLVMSupport)
+  LLVM_COMPONENT
+  Support
+)
Index: llvm/lib/Frontend/OpenACC/CMakeLists.txt
===================================================================
--- llvm/lib/Frontend/OpenACC/CMakeLists.txt
+++ llvm/lib/Frontend/OpenACC/CMakeLists.txt
@@ -12,7 +12,7 @@
   DEPENDS
   acc_gen
   acc_cpp
-)
-
-target_link_libraries(LLVMFrontendOpenACC LLVMSupport)
 
+  LINK_COMPONENTS
+  Support
+)