commit 93f8f55e19c29e1889dc72eb62292c383e76d3a0
author Reid Spencer <rspencer@reidspencer.com> Mon Dec 13 23:44:23 2004 +0000
committer Reid Spencer <rspencer@reidspencer.com> Mon Dec 13 23:44:23 2004 +0000
tree 93b5aa3b9a00b96297618c1e0f86c6073d592f54
parent 51ab8ec66ed8259d842490055659027a58a77910

For PR351:
Adjust to interface change for FindExecutable.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18920 91177308-0d34-0410-b5e6-96231b3b80d8

tools/llvm-ld/llvm-ld.cpp

diff --git a/tools/llvm-ld/llvm-ld.cpp b/tools/llvm-ld/llvm-ld.cpp
index ae64d57..b4e22f0 100644
--- a/tools/llvm-ld/llvm-ld.cpp
+++ b/tools/llvm-ld/llvm-ld.cpp
@@ -481,11 +481,11 @@
       sys::RemoveFileOnSignal(sys::Path(OutputFilename));
 
       // Determine the locations of the llc and gcc programs.
-      std::string llc = FindExecutable("llc", argv[0]);
-      std::string gcc = FindExecutable("gcc", argv[0]);
+      std::string llc = FindExecutable("llc", argv[0]).toString();
       if (llc.empty())
         return PrintAndReturn("Failed to find llc");
 
+      std::string gcc = FindExecutable("gcc", argv[0]).toString();
       if (gcc.empty())
         return PrintAndReturn("Failed to find gcc");
 
@@ -506,10 +506,11 @@
       sys::RemoveFileOnSignal(sys::Path(OutputFilename));
 
       // Determine the locations of the llc and gcc programs.
-      std::string llc = FindExecutable("llc", argv[0]);
-      std::string gcc = FindExecutable("gcc", argv[0]);
+      std::string llc = FindExecutable("llc", argv[0]).toString();
       if (llc.empty())
         return PrintAndReturn("Failed to find llc");
+
+      std::string gcc = FindExecutable("gcc", argv[0]).toString();
       if (gcc.empty())
         return PrintAndReturn("Failed to find gcc");