Fix BUILD_SHARED_LIBS builds after r361567

Also fixed a comment I noticed while debugging this build

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@361591 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/cmake/modules/LLVM-Config.cmake b/cmake/modules/LLVM-Config.cmake
index 57c02f170e18f5bedfe2e380aca8bc06fccdb6f5..be28ca4f052eaa0aecae8102589536cc257fca03 100644 (file)
--- a/cmake/modules/LLVM-Config.cmake
+++ b/cmake/modules/LLVM-Config.cmake
@@ -210,7 +210,7 @@ function(llvm_map_components_to_libnames out_libs)
     elseif( c STREQUAL "all" )
       list(APPEND expanded_components ${LLVM_AVAILABLE_LIBS})
     elseif( c STREQUAL "AllTargetsCodeGens" )
-      # Link all the asm printers from all the targets
+      # Link all the codegens from all the targets
       foreach(t ${LLVM_TARGETS_TO_BUILD})
         if( TARGET LLVM${t}CodeGen)
           list(APPEND expanded_components "LLVM${t}CodeGen")

diff --git a/tools/bugpoint/CMakeLists.txt b/tools/bugpoint/CMakeLists.txt
index 6ed15a24a2d4d38bfb0d1cddf1ed896759e4d2fc..031f51480cce7377accc9427e8c1eeb14c651e8d 100644 (file)
--- a/tools/bugpoint/CMakeLists.txt
+++ b/tools/bugpoint/CMakeLists.txt
@@ -1,6 +1,8 @@
 set(LLVM_LINK_COMPONENTS
   AllTargetsAsmParsers
   AllTargetsCodeGens
+  AllTargetsDescs
+  AllTargetsInfos
   Analysis
   BitWriter
   CodeGen

diff --git a/tools/llc/CMakeLists.txt b/tools/llc/CMakeLists.txt
index 863358b5e71c73c838b3afba97366441ea771f8c..130f0cd3cb9e81483800c6f8966d3884ad02c4eb 100644 (file)
--- a/tools/llc/CMakeLists.txt
+++ b/tools/llc/CMakeLists.txt
@@ -1,6 +1,8 @@
 set(LLVM_LINK_COMPONENTS
   AllTargetsAsmParsers
   AllTargetsCodeGens
+  AllTargetsDescs
+  AllTargetsInfos
   Analysis
   AsmPrinter
   CodeGen

diff --git a/tools/llvm-c-test/CMakeLists.txt b/tools/llvm-c-test/CMakeLists.txt
index 78eaafc3b5a403f8a4767a6fd5792aac7667c5fe..939164e63621614ce44898c16d058ba87276202c 100644 (file)
--- a/tools/llvm-c-test/CMakeLists.txt
+++ b/tools/llvm-c-test/CMakeLists.txt
@@ -1,7 +1,9 @@
 set(LLVM_LINK_COMPONENTS
   AllTargetsAsmParsers
   AllTargetsCodeGens
+  AllTargetsDescs
   AllTargetsDisassemblers
+  AllTargetsInfos
   BitReader
   Core
   MCDisassembler

diff --git a/tools/llvm-dwp/CMakeLists.txt b/tools/llvm-dwp/CMakeLists.txt
index 49f40b5c6397b6732d66d0ac9c4fb15a93809dec..bf40768ebd4a54bfb82066547605f8c92c182a17 100644 (file)
--- a/tools/llvm-dwp/CMakeLists.txt
+++ b/tools/llvm-dwp/CMakeLists.txt
@@ -1,6 +1,8 @@
 set(LLVM_LINK_COMPONENTS
   AllTargetsAsmParsers
   AllTargetsCodeGens
+  AllTargetsDescs
+  AllTargetsInfos
   AsmPrinter
   DebugInfoDWARF
   MC

diff --git a/tools/llvm-lto/CMakeLists.txt b/tools/llvm-lto/CMakeLists.txt
index d0222315d25f7e5c7a9c6db88d085246bccbfa90..69868fb870c048fa6b6dcc4ed4eb66586617b0e5 100644 (file)
--- a/tools/llvm-lto/CMakeLists.txt
+++ b/tools/llvm-lto/CMakeLists.txt
@@ -1,6 +1,8 @@
 set(LLVM_LINK_COMPONENTS
   AllTargetsAsmParsers
   AllTargetsCodeGens
+  AllTargetsDescs
+  AllTargetsInfos
   BitReader
   BitWriter
   Core

diff --git a/tools/llvm-lto2/CMakeLists.txt b/tools/llvm-lto2/CMakeLists.txt
index 233817a387f9d9940a439bf2129465fe5ec1a395..7f2db01c9c91687fc0d943b017a863a3810b26d3 100644 (file)
--- a/tools/llvm-lto2/CMakeLists.txt
+++ b/tools/llvm-lto2/CMakeLists.txt
@@ -2,6 +2,7 @@ set(LLVM_LINK_COMPONENTS
   AllTargetsAsmParsers
   AllTargetsCodeGens
   AllTargetsDescs
+  AllTargetsInfos
   BitReader
   Core
   Linker

diff --git a/tools/opt/CMakeLists.txt b/tools/opt/CMakeLists.txt
index 2f9665c6898075920ce57f64394d8863897fefa7..c9e44449dc2fb23cafc53cbef6dc8a538e8b92b2 100644 (file)
--- a/tools/opt/CMakeLists.txt
+++ b/tools/opt/CMakeLists.txt
@@ -1,6 +1,7 @@
 set(LLVM_LINK_COMPONENTS
   AllTargetsAsmParsers
   AllTargetsCodeGens
+  AllTargetsDescs
   AllTargetsInfos
   AggressiveInstCombine
   Analysis