[llvm-commits] CVS: llvm/tools/llvm-ld/llvm-ld.cpp

[Reid Spencer]

Changes in directory llvm/tools/llvm-ld:

llvm-ld.cpp updated: 1.6 -> 1.7
---
Log message:

When -link-as-library, add -l options to Module's deplibs

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

Index: llvm/tools/llvm-ld/llvm-ld.cpp
diff -u llvm/tools/llvm-ld/llvm-ld.cpp:1.6 llvm/tools/llvm-ld/llvm-ld.cpp:1.7
--- llvm/tools/llvm-ld/llvm-ld.cpp:1.6	Sun Dec  5 13:15:29 2004
+++ llvm/tools/llvm-ld/llvm-ld.cpp	Tue Dec  7 23:17:40 2004
@@ -397,10 +397,17 @@
   std::auto_ptr<Module> Composite(0);
 
   if (LinkAsLibrary) {
-    // Link in only the files, we ignore libraries in this case.
+    // Link in only the files.
     Composite.reset( new Module(argv[0]) );
     if (LinkFiles(argv[0], Composite.get(), InputFilenames, Verbose))
       return 1; // Error already printed
+
+    // The libraries aren't linked in but are noted as "dependent" in the
+    // module.
+    for (cl::list<std::string>::const_iterator I = Libraries.begin(), 
+         E = Libraries.end(); I != E ; ++I) {
+      Composite.get()->addLibrary(*I);
+    }
   } else {
     // Build a list of the items from our command line
     LinkItemList Items;