From b0794619e636c3d4a0ce4f8289fc91143b45607b Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Mon, 5 Jan 2009 19:01:32 +0000 Subject: make llvm-ld smart enough to link against native libraries that are not in system library directories by checking -L paths as well. Patch by Axel Naumann! llvm-svn: 61730 --- llvm/tools/llvm-ld/llvm-ld.cpp | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'llvm/tools/llvm-ld/llvm-ld.cpp') diff --git a/llvm/tools/llvm-ld/llvm-ld.cpp b/llvm/tools/llvm-ld/llvm-ld.cpp index ed52254573b..28187c932db 100644 --- a/llvm/tools/llvm-ld/llvm-ld.cpp +++ b/llvm/tools/llvm-ld/llvm-ld.cpp @@ -36,6 +36,7 @@ #include "llvm/Support/Streams.h" #include "llvm/Support/SystemUtils.h" #include "llvm/System/Signals.h" +#include "llvm/Config/config.h" #include #include #include @@ -437,8 +438,23 @@ static void EmitShellScript(char **argv) { // on the command line, so that we don't have to do this manually! for (std::vector::iterator i = Libraries.begin(), e = Libraries.end(); i != e; ++i) { - sys::Path FullLibraryPath = sys::Path::FindLibrary(*i); - if (!FullLibraryPath.isEmpty() && FullLibraryPath.isDynamicLibrary()) + // try explicit -L arguments first: + sys::Path FullLibraryPath; + for (cl::list::const_iterator P = LibPaths.begin(), + E = LibPaths.end(); P != E; ++P) { + FullLibraryPath = *P; + FullLibraryPath.appendComponent("lib" + *i); + FullLibraryPath.appendSuffix(&(LTDL_SHLIB_EXT[1])); + if (!FullLibraryPath.isEmpty()) { + if (!FullLibraryPath.isDynamicLibrary()) { + // Not a native shared library; mark as invalid + FullLibraryPath = sys::Path(); + } else break; + } + } + if (FullLibraryPath.isEmpty()) + FullLibraryPath = sys::Path::FindLibrary(*i); + if (!FullLibraryPath.isEmpty()) Out2 << " -load=" << FullLibraryPath.toString() << " \\\n"; } Out2 << " $0.bc ${1+\"$@\"}\n"; -- cgit v1.2.3