llvm-config-2: Switch to using real library dependency table.

 - Also, fix a refacto that left extra "all" component in list (this is now
   defined in the groups explicitly)
 - Reapply of r143879 now that Make should see needed deps.

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

1 files changed, 1 insertions, 10 deletions

diff --git a/tools/llvm-config-2/llvm-config.cpp b/tools/llvm-config-2/llvm-config.cpp
index 525f3992ac..ec0daad035 100644
--- a/tools/llvm-config-2/llvm-config.cpp
+++ b/tools/llvm-config-2/llvm-config.cpp
@@ -43,15 +43,7 @@ using namespace llvm;
 //
 // Not all components define a library, we also use "library groups" as a way to
 // create entries for pseudo groups like x86 or all-targets.
-//
-// FIXME: Include real component table.
-struct AvailableComponent {
-  const char *Name;
-  const char *Library;
-  const char *RequiredLibraries[1];
-} AvailableComponents[1] = {
-  { "all", 0, { } }
-};
+#include "LibraryDependencies.inc"
 
 /// \brief Traverse a single component adding to the topological ordering in
 /// \arg RequiredLibs.
@@ -264,7 +256,6 @@ int main(int argc, char **argv) {
       } else if (Arg == "--libfiles") {
         PrintLibFiles = true;
       } else if (Arg == "--components") {
-        OS << "all";
         for (unsigned j = 0; j != array_lengthof(AvailableComponents); ++j) {
           OS << ' ';
           OS << AvailableComponents[j].Name;