diff options
| author | Mikhail Glushenkov <foldr@codedgers.com> | 2010-11-02 20:47:41 +0000 |
|---|---|---|
| committer | Mikhail Glushenkov <foldr@codedgers.com> | 2010-11-02 20:47:41 +0000 |
| commit | 0ddd57451ea9eeabd963645f8e9b199b6a702dd5 (patch) | |
| tree | 27cfd58903517cded4cd177aa4e7c277ad1a5ff0 /llvm/lib/CompilerDriver/Action.cpp | |
| parent | 9f20daf3b4dae226f02aaa2eb7f36ab1ca190387 (diff) | |
| download | llvm-0ddd57451ea9eeabd963645f8e9b199b6a702dd5.zip llvm-0ddd57451ea9eeabd963645f8e9b199b6a702dd5.tar.gz llvm-0ddd57451ea9eeabd963645f8e9b199b6a702dd5.tar.bz2 | |
llvmc: Fix tool finding logic.
llvm-svn: 118056
Diffstat (limited to 'llvm/lib/CompilerDriver/Action.cpp')
| -rw-r--r-- | llvm/lib/CompilerDriver/Action.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/llvm/lib/CompilerDriver/Action.cpp b/llvm/lib/CompilerDriver/Action.cpp index 3503bd3..54b55d0 100644 --- a/llvm/lib/CompilerDriver/Action.cpp +++ b/llvm/lib/CompilerDriver/Action.cpp @@ -53,18 +53,18 @@ namespace { #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()) { |