Skip to content

Commit

Permalink
Revert r197380, "llvm-config: Print SYSTEM_LIBS with --libs, instead …
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
chapuni committed Dec 18, 2013
1 parent b7967ba commit 010a40c
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions tools/llvm-config/llvm-config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down Expand Up @@ -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";
Expand Down

0 comments on commit 010a40c

Please sign in to comment.