maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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

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

llvm-svn: 197583
This commit is contained in:
NAKAMURA Takumi 2013-12-18 16:21:16 +00:00
parent b4ca40bd4d
commit 4b0ffe7e49
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
llvm/tools/llvm-config/llvm-config.cpp
View File

@ -285,7 +285,8 @@ int main(int argc, char **argv) {
} else if (Arg == "--cxxflags") { } else if (Arg == "--cxxflags") {
OS << ActiveIncludeOption << ' ' << LLVM_CXXFLAGS << '\n'; OS << ActiveIncludeOption << ' ' << LLVM_CXXFLAGS << '\n';
} else if (Arg == "--ldflags") { } else if (Arg == "--ldflags") {
OS << "-L" << ActiveLibDir << ' ' << LLVM_LDFLAGS << '\n'; OS << "-L" << ActiveLibDir << ' ' << LLVM_LDFLAGS
<< ' ' << LLVM_SYSTEM_LIBS << '\n';
} else if (Arg == "--libs") { } else if (Arg == "--libs") {
PrintLibs = true; PrintLibs = true;
} else if (Arg == "--libnames") { } else if (Arg == "--libnames") {
@ -359,13 +360,6 @@ int main(int argc, char **argv) {
OS << ActiveLibDir << '/' << Lib; 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'; OS << '\n';
} else if (!Components.empty()) { } else if (!Components.empty()) {
errs() << "llvm-config: error: components given, but unused\n\n"; errs() << "llvm-config: error: components given, but unused\n\n";