From 56c0371a3cbc98ef5dc039324ad43c153ff601c4 Mon Sep 17 00:00:00 2001 From: Mateusz Mikula Date: Thu, 2 Feb 2017 11:48:25 +0100 Subject: [PATCH 4/5] llvm-config: look for unversioned shared lib on win32 --- tools/llvm-config/llvm-config.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp index 08b096afb05..e388d9e5d3f 100644 --- a/tools/llvm-config/llvm-config.cpp +++ b/tools/llvm-config/llvm-config.cpp @@ -353,10 +353,11 @@ int main(int argc, char **argv) { const Triple HostTriple(Triple::normalize(LLVM_HOST_TRIPLE)); if (HostTriple.isOSWindows()) { SharedExt = "dll"; - SharedVersionedExt = LLVM_DYLIB_VERSION ".dll"; + SharedVersionedExt = ".dll"; if (HostTriple.isOSCygMing()) { StaticExt = "a"; StaticPrefix = "lib"; + SharedPrefix = "lib"; } else { StaticExt = "lib"; DirSep = "\\"; @@ -393,7 +393,7 @@ bool DyLibExists = false; const std::string DyLibName = - (SharedPrefix + "LLVM-" + SharedVersionedExt).str(); + (SharedPrefix + (HostTriple.isOSWindows() ? "LLVM" : "LLVM-") + SharedVersionedExt).str(); // If LLVM_LINK_DYLIB is ON, the single shared library will be returned // for "--libs", etc, if they exist. This behaviour can be overridden with -- 2.13.3