llvm-config: fix --libs on Linux

[rivanvx]

Summary

llvm-config --libs does not produce correct output since commit r260263
(llvm-config: Add preliminary Windows support) changed naming format of
the libraries. This patch updates llvm-config to recognize new naming
format and output correct linker flags.

Ref: https://llvm.org/bugs/show_bug.cgi?id=26581

[rnk]

lgtm, I'll go ahead and land this.

[rnk]

I suspect that this does not do the right thing on Windows. Now --libs prints Unix style -l options, instead of paths as it was made to do in the revision you're pointing at.

[rnk]

Ehsan, what did you intend the behavior of --libs on Windows to be? We definitely want to use -l flags on Unix, like we did before.

[rivanvx]

It does not do anything special on any OS, but I guess it should. I'm happy to adjust it for Windows if you give me the specification.

[rivanvx]

Handle Windows first, output full path. Elsewhere, output -l and library name.

[rivanvx]

rnk, ehsan, any comments? Anything else I should do?

[• ehsan]

(Sorry for the delay, I just got back from vacation!)

In D17300#353762, @rnk wrote:

Ehsan, what did you intend the behavior of --libs on Windows to be? We definitely want to use -l flags on Unix, like we did before.

The right behavior on Windows would be to print the path to the library so that the linker picks it up, as this patch does.

tools/llvm-config/llvm-config.cpp

674 ↗

(On Diff #48175)

Nit: you can hoist this own into the else branch.

675 ↗

(On Diff #48175)

This will do the wrong thing on Cygwin/Mingw (see the code around line 359.)

I think you should check isWindowsMSVCEnvironment() here instead.

[rivanvx]

Sorry for the delay, I only read "ehsan accepted this revision" and did not notice there were comments.

[pxli168]

LGTM!
It fixed the problem that our project could not built with llvm 3.9.
Hope this fix can merge in soon.
Thanks.

[rivanvx]

@rnk can you re-review?

[rnk]

lgtm, committing

[rivanvx]

Thanks!

llvm/trunk/tools/llvm-config/llvm-config.cpp

if (PrintLibs || PrintLibNames || PrintLibFiles) {
 
       auto PrintForLib = [&](const StringRef &Lib) {
         const bool Shared = LinkMode == LinkModeShared;
         if (PrintLibNames) {
           OS << GetComponentLibraryFileName(Lib, Shared);
         } else if (PrintLibFiles) {
           OS << GetComponentLibraryPath(Lib, Shared);
         } else if (PrintLibs) {
-          // If this is a typical library name, include it using -l.
+          // On Windows, output full path to library without parameters.
+          // Elsewhere, if this is a typical library name, include it using -l.
+          if (HostTriple.isWindowsMSVCEnvironment()) {
+            OS << GetComponentLibraryPath(Lib, Shared);
+          } else {
             StringRef LibName;
-          if (Lib.startswith("lib")) {
             if (GetComponentLibraryNameSlice(Lib, LibName)) {
+              // Extract library name (remove prefix and suffix).
               OS << "-l" << LibName;
             } else {
-              OS << "-l:" << GetComponentLibraryFileName(Lib, Shared);
+              // Lib is already a library name without prefix and suffix.
+              OS << "-l" << Lib;
             }
-          } else {
-            // Otherwise, print the full path.
-            OS << GetComponentLibraryPath(Lib, Shared);
           }
         }
       };
 
       if (LinkMode == LinkModeShared && !BuiltSharedLibs) {
         PrintForLib(DyLibName);
       } else {
         for (unsigned i = 0, e = RequiredLibs.size(); i != e; ++i) {