mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-27 15:29:51 +00:00
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! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@61730 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
86ae142c51
commit
5d5a897529
@ -36,6 +36,7 @@
|
|||||||
#include "llvm/Support/Streams.h"
|
#include "llvm/Support/Streams.h"
|
||||||
#include "llvm/Support/SystemUtils.h"
|
#include "llvm/Support/SystemUtils.h"
|
||||||
#include "llvm/System/Signals.h"
|
#include "llvm/System/Signals.h"
|
||||||
|
#include "llvm/Config/config.h"
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
@ -437,8 +438,23 @@ static void EmitShellScript(char **argv) {
|
|||||||
// on the command line, so that we don't have to do this manually!
|
// on the command line, so that we don't have to do this manually!
|
||||||
for (std::vector<std::string>::iterator i = Libraries.begin(),
|
for (std::vector<std::string>::iterator i = Libraries.begin(),
|
||||||
e = Libraries.end(); i != e; ++i) {
|
e = Libraries.end(); i != e; ++i) {
|
||||||
sys::Path FullLibraryPath = sys::Path::FindLibrary(*i);
|
// try explicit -L arguments first:
|
||||||
if (!FullLibraryPath.isEmpty() && FullLibraryPath.isDynamicLibrary())
|
sys::Path FullLibraryPath;
|
||||||
|
for (cl::list<std::string>::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 << " -load=" << FullLibraryPath.toString() << " \\\n";
|
||||||
}
|
}
|
||||||
Out2 << " $0.bc ${1+\"$@\"}\n";
|
Out2 << " $0.bc ${1+\"$@\"}\n";
|
||||||
|
Loading…
Reference in New Issue
Block a user