Revert r197380, "llvm-config: Print SYSTEM_LIBS with --libs, instead of --ldflags."

I will introduce another flag, like --system-libs, later.

llvm-svn: 197583

1 files changed, 2 insertions, 8 deletions

diff --git a/llvm/tools/llvm-config/llvm-config.cpp b/llvm/tools/llvm-config/llvm-config.cpp
index b12be86..040d111 100644
--- a/llvm/tools/llvm-config/llvm-config.cpp
+++ b/llvm/tools/llvm-config/llvm-config.cpp
@@ -285,7 +285,8 @@ int main(int argc, char **argv) {
       } else if (Arg == "--cxxflags") {
         OS << ActiveIncludeOption << ' ' << LLVM_CXXFLAGS << '\n';
       } else if (Arg == "--ldflags") {
-        OS << "-L" << ActiveLibDir << ' ' << LLVM_LDFLAGS << '\n';
+        OS << "-L" << ActiveLibDir << ' ' << LLVM_LDFLAGS
+           << ' ' << LLVM_SYSTEM_LIBS << '\n';
       } else if (Arg == "--libs") {
         PrintLibs = true;
       } else if (Arg == "--libnames") {
@@ -359,13 +360,6 @@ int main(int argc, char **argv) {
         OS << ActiveLibDir << '/' << Lib;
       }
     }
-
-    // Print system libs in the next line.
-    // Assume LLVMSupport depends on system_libs.
-    // FIXME: LLVMBuild may take care of dependencies to system_libs.
-    if (PrintLibs)
-      OS << '\n' << LLVM_SYSTEM_LIBS;
-
     OS << '\n';
   } else if (!Components.empty()) {
     errs() << "llvm-config: error: components given, but unused\n\n";