From aa086c31cb582807264cfd853a5b8900ff136f3e Mon Sep 17 00:00:00 2001
From: Daniel Sanders <daniel_l_sanders@apple.com>
Date: Fri, 24 May 2019 02:15:27 +0000
Subject: [PATCH] Fix BUILD_SHARED_LIBS builds after r361567

Also fixed a comment I noticed while debugging this build

llvm-svn: 361591
---
 cmake/modules/LLVM-Config.cmake  | 2 +-
 tools/bugpoint/CMakeLists.txt    | 2 ++
 tools/llc/CMakeLists.txt         | 2 ++
 tools/llvm-c-test/CMakeLists.txt | 2 ++
 tools/llvm-dwp/CMakeLists.txt    | 2 ++
 tools/llvm-lto/CMakeLists.txt    | 2 ++
 tools/llvm-lto2/CMakeLists.txt   | 1 +
 tools/opt/CMakeLists.txt         | 1 +
 8 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/cmake/modules/LLVM-Config.cmake b/cmake/modules/LLVM-Config.cmake
index 57c02f170e1..be28ca4f052 100644
--- 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 6ed15a24a2d..031f51480cc 100644
--- 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 863358b5e71..130f0cd3cb9 100644
--- 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 78eaafc3b5a..939164e6362 100644
--- 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 49f40b5c639..bf40768ebd4 100644
--- 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 d0222315d25..69868fb870c 100644
--- 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 233817a387f..7f2db01c9c9 100644
--- 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 2f9665c6898..c9e44449dc2 100644
--- a/tools/opt/CMakeLists.txt
+++ b/tools/opt/CMakeLists.txt
@@ -1,6 +1,7 @@
 set(LLVM_LINK_COMPONENTS
   AllTargetsAsmParsers
   AllTargetsCodeGens
+  AllTargetsDescs
   AllTargetsInfos
   AggressiveInstCombine
   Analysis