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

[Reid Spencer]

Changes in directory llvm/tools/llvm-ld:

llvm-ld.cpp updated: 1.29 -> 1.30
---
Log message:

Make sure command line options are parsed before we try to add the LibPath
(-L options) to TheLinker. Problem noticed by Wink Saville.


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

 llvm-ld.cpp |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Index: llvm/tools/llvm-ld/llvm-ld.cpp
diff -u llvm/tools/llvm-ld/llvm-ld.cpp:1.29 llvm/tools/llvm-ld/llvm-ld.cpp:1.30
--- llvm/tools/llvm-ld/llvm-ld.cpp:1.29	Mon Jan  9 21:14:40 2006
+++ llvm/tools/llvm-ld/llvm-ld.cpp	Mon Mar  6 00:38:19 2006
@@ -406,14 +406,14 @@
     progname = sys::Path(argv[0]).getBasename();
     Linker TheLinker(progname, OutputFilename, Verbose);
 
-    // Set up the library paths for the Linker
-    TheLinker.addPaths(LibPaths);
-    TheLinker.addSystemPaths();
-
     // Parse the command line options
     cl::ParseCommandLineOptions(argc, argv, " llvm linker\n");
     sys::PrintStackTraceOnErrorSignal();
 
+    // Set up the library paths for the Linker
+    TheLinker.addPaths(LibPaths);
+    TheLinker.addSystemPaths();
+
     // Remove any consecutive duplicates of the same library...
     Libraries.erase(std::unique(Libraries.begin(), Libraries.end()),
                     Libraries.end());