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

Reid Spencer reid at x10sys.com
Sun Dec 12 19:01:13 PST 2004



Changes in directory llvm/tools/llvm-link:

llvm-link.cpp updated: 1.51 -> 1.52
---
Log message:

LinkModules is now in the Linker class

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

Index: llvm/tools/llvm-link/llvm-link.cpp
diff -u llvm/tools/llvm-link/llvm-link.cpp:1.51 llvm/tools/llvm-link/llvm-link.cpp:1.52
--- llvm/tools/llvm-link/llvm-link.cpp:1.51	Fri Dec 10 18:14:15 2004
+++ llvm/tools/llvm-link/llvm-link.cpp	Sun Dec 12 21:01:03 2004
@@ -99,7 +99,7 @@
 
     if (Verbose) std::cerr << "Linking in '" << InputFilenames[i] << "'\n";
 
-    if (LinkModules(Composite.get(), M.get(), &ErrorMessage)) {
+    if (Linker::LinkModules(Composite.get(), M.get(), &ErrorMessage)) {
       std::cerr << argv[0] << ": link error in '" << InputFilenames[i]
                 << "': " << ErrorMessage << "\n";
       return 1;






More information about the llvm-commits mailing list