diff options
author | NAKAMURA Takumi <geek4civic@gmail.com> | 2013-12-18 16:21:16 +0000 |
---|---|---|
committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2013-12-18 16:21:16 +0000 |
commit | 010a40c0800ad8e3ebc13a988cfb3fd959079f91 (patch) | |
tree | cb56ba7a474deb1de5d20d6d88a029bcf4dcee18 /tools/llvm-config | |
parent | b7967ba23770348d3be7f9aa38d7b4721cd636ef (diff) | |
download | llvm-010a40c0800ad8e3ebc13a988cfb3fd959079f91.tar.gz llvm-010a40c0800ad8e3ebc13a988cfb3fd959079f91.tar.bz2 llvm-010a40c0800ad8e3ebc13a988cfb3fd959079f91.tar.xz |
Revert r197380, "llvm-config: Print SYSTEM_LIBS with --libs, instead of --ldflags."
I will introduce another flag, like --system-libs, later.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@197583 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/llvm-config')
-rw-r--r-- | tools/llvm-config/llvm-config.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp index b12be86342..040d111033 100644 --- a/tools/llvm-config/llvm-config.cpp +++ b/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"; |