diff --git a/tools/llvm-dis/CMakeLists.txt b/tools/llvm-dis/CMakeLists.txt
index d62a6b5ec895..3125f8a5c6bb 100644
--- a/tools/llvm-dis/CMakeLists.txt
+++ b/tools/llvm-dis/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(LLVM_LINK_COMPONENTS bitreader)
+set(LLVM_LINK_COMPONENTS bitreader analysis)
 set(LLVM_REQUIRES_EH 1)
 
 add_llvm_tool(llvm-dis
diff --git a/tools/lto/CMakeLists.txt b/tools/lto/CMakeLists.txt
index a316ef788e69..b0aebd4f2ee1 100644
--- a/tools/lto/CMakeLists.txt
+++ b/tools/lto/CMakeLists.txt
@@ -1,4 +1,6 @@
-set(LLVM_LINK_COMPONENTS ipo scalaropts linker bitreader bitwriter)
+set(LLVM_LINK_COMPONENTS
+  ${LLVM_TARGETS_TO_BUILD}
+  ipo scalaropts linker bitreader bitwriter)
 
 add_definitions( -DLLVM_VERSION_INFO=\"${PACKAGE_VERSION}\" )