[llvm-commits] CVS: llvm/lib/Linker/LinkArchives.cpp

[Reid Spencer]

Changes in directory llvm/lib/Linker:

LinkArchives.cpp updated: 1.40 -> 1.41
---
Log message:

Revert version 1.39. It breaks the ordering of the library processing.


---
Diffs of the changes:  (+1 -8)

Index: llvm/lib/Linker/LinkArchives.cpp
diff -u llvm/lib/Linker/LinkArchives.cpp:1.40 llvm/lib/Linker/LinkArchives.cpp:1.41
--- llvm/lib/Linker/LinkArchives.cpp:1.40	Mon Nov 29 06:40:21 2004
+++ llvm/lib/Linker/LinkArchives.cpp	Tue Nov 30 16:54:48 2004
@@ -371,19 +371,12 @@
 ///  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);