[llvm-commits] [llvm] r118056 - /llvm/trunk/lib/CompilerDriver/Action.cpp

[Mikhail Glushenkov]

Author: foldr
Date: Tue Nov  2 15:47:41 2010
New Revision: 118056

URL: http://llvm.org/viewvc/llvm-project?rev=118056&view=rev
Log:
llvmc: Fix tool finding logic.

Modified:
    llvm/trunk/lib/CompilerDriver/Action.cpp

Modified: llvm/trunk/lib/CompilerDriver/Action.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CompilerDriver/Action.cpp?rev=118056&r1=118055&r2=118056&view=diff
==============================================================================
--- llvm/trunk/lib/CompilerDriver/Action.cpp (original)
+++ llvm/trunk/lib/CompilerDriver/Action.cpp Tue Nov  2 15:47:41 2010
@@ -53,18 +53,18 @@
 #endif
   }
 
-  int ExecuteProgram (const std::string& name,
-                      const StrVector& args) {
+  int ExecuteProgram (const std::string& name, const StrVector& args) {
     sys::Path prog(name);
 
-    if (!prog.isAbsolute())
+    if (!prog.isAbsolute()) {
       prog = FindExecutable(name, ProgramName, (void *)(intptr_t)&Main);
 
-    if (prog.isEmpty()) {
-      prog = sys::Program::FindProgramByName(name);
-      if (prog.isEmpty()) {
-        PrintError("Can't find program '" + name + "'");
-        return -1;
+      if (!prog.canExecute()) {
+        prog = sys::Program::FindProgramByName(name);
+        if (prog.isEmpty()) {
+          PrintError("Can't find program '" + name + "'");
+          return -1;
+        }
       }
     }
     if (!prog.canExecute()) {