From 0022b834914ba49d11a43c0c06c47edfdc59524f Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Tue, 30 Nov 2004 22:54:48 +0000 Subject: Revert version 1.39. It breaks the ordering of the library processing. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18399 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Linker/LinkArchives.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'lib/Linker') diff --git a/lib/Linker/LinkArchives.cpp b/lib/Linker/LinkArchives.cpp index 3ba10fbef6..af17ff31b8 100644 --- a/lib/Linker/LinkArchives.cpp +++ b/lib/Linker/LinkArchives.cpp @@ -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 &Libs, + const std::vector &Libraries, const std::vector &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); -- cgit v1.2.3