forked from OSchip/llvm-project
Make sure command line options are parsed before we try to add the LibPath
(-L options) to TheLinker. Problem noticed by Wink Saville. llvm-svn: 26571
This commit is contained in:
parent
c5c0658aa6
commit
8e5da55b6d
llvm/tools/llvm-ld
|
@ -406,14 +406,14 @@ int main(int argc, char **argv, char **envp) {
|
||||||
progname = sys::Path(argv[0]).getBasename();
|
progname = sys::Path(argv[0]).getBasename();
|
||||||
Linker TheLinker(progname, OutputFilename, Verbose);
|
Linker TheLinker(progname, OutputFilename, Verbose);
|
||||||
|
|
||||||
// Set up the library paths for the Linker
|
|
||||||
TheLinker.addPaths(LibPaths);
|
|
||||||
TheLinker.addSystemPaths();
|
|
||||||
|
|
||||||
// Parse the command line options
|
// Parse the command line options
|
||||||
cl::ParseCommandLineOptions(argc, argv, " llvm linker\n");
|
cl::ParseCommandLineOptions(argc, argv, " llvm linker\n");
|
||||||
sys::PrintStackTraceOnErrorSignal();
|
sys::PrintStackTraceOnErrorSignal();
|
||||||
|
|
||||||
|
// Set up the library paths for the Linker
|
||||||
|
TheLinker.addPaths(LibPaths);
|
||||||
|
TheLinker.addSystemPaths();
|
||||||
|
|
||||||
// Remove any consecutive duplicates of the same library...
|
// Remove any consecutive duplicates of the same library...
|
||||||
Libraries.erase(std::unique(Libraries.begin(), Libraries.end()),
|
Libraries.erase(std::unique(Libraries.begin(), Libraries.end()),
|
||||||
Libraries.end());
|
Libraries.end());
|
||||||
|
|
Loading…
Reference in New Issue