mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-12-27 22:15:18 +00:00
Revert version 1.39. It breaks the ordering of the library processing.
llvm-svn: 18399
This commit is contained in:
parent
0abd8109fa
commit
af68e19395
@ -371,19 +371,12 @@ bool llvm::LinkFiles(const char *progname, Module *HeadModule,
|
||||
/// TRUE - Error.
|
||||
///
|
||||
void llvm::LinkLibraries(const char *progname, Module *HeadModule,
|
||||
const std::vector<std::string> &Libs,
|
||||
const std::vector<std::string> &Libraries,
|
||||
const std::vector<std::string> &LibPaths,
|
||||
bool Verbose, bool Native) {
|
||||
// String in which to receive error messages.
|
||||
std::string ErrorMessage;
|
||||
|
||||
// Build a set of library names that we should try, including the
|
||||
// HeadModule's dependent libraries. We use a set here to eliminate
|
||||
// duplicates between the module's libraries and the argument Libs.
|
||||
Module::LibraryListType Libraries(HeadModule->getLibraries());
|
||||
Libraries.insert(Libs.begin(),Libs.end());
|
||||
|
||||
// For each library
|
||||
for (unsigned i = 0; i < Libraries.size(); ++i) {
|
||||
// Determine where this library lives.
|
||||
std::string Pathname = FindLib(Libraries[i], LibPaths);
|
||||
|
Loading…
Reference in New Issue
Block a user