diff options
Diffstat (limited to 'contrib/llvm/lib/CompilerDriver/Action.cpp')
| -rw-r--r-- | contrib/llvm/lib/CompilerDriver/Action.cpp | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/contrib/llvm/lib/CompilerDriver/Action.cpp b/contrib/llvm/lib/CompilerDriver/Action.cpp index 0be8049..a8d625c 100644 --- a/contrib/llvm/lib/CompilerDriver/Action.cpp +++ b/contrib/llvm/lib/CompilerDriver/Action.cpp @@ -14,11 +14,12 @@ #include "llvm/CompilerDriver/Action.h" #include "llvm/CompilerDriver/BuiltinOptions.h" #include "llvm/CompilerDriver/Error.h" +#include "llvm/CompilerDriver/Main.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Support/SystemUtils.h" -#include "llvm/System/Program.h" -#include "llvm/System/TimeValue.h" +#include "llvm/Support/Program.h" +#include "llvm/Support/TimeValue.h" #include <stdexcept> #include <string> @@ -28,7 +29,6 @@ using namespace llvmc; namespace llvmc { -extern int Main(int argc, char** argv); extern const char* ProgramName; } @@ -53,15 +53,19 @@ namespace { #endif } - int ExecuteProgram (const std::string& name, - const StrVector& args) { - sys::Path prog = sys::Program::FindProgramByName(name); + int ExecuteProgram (const std::string& name, const StrVector& args) { + sys::Path prog(name); - if (prog.isEmpty()) { - prog = FindExecutable(name, ProgramName, (void *)(intptr_t)&Main); - if (prog.isEmpty()) { - PrintError("Can't find program '" + name + "'"); - return -1; + if (sys::path::is_relative(prog.str())) { + prog = PrependMainExecutablePath(name, ProgramName, + (void *)(intptr_t)&Main); + + if (!prog.canExecute()) { + prog = sys::Program::FindProgramByName(name); + if (prog.isEmpty()) { + PrintError("Can't find program '" + name + "'"); + return -1; + } } } if (!prog.canExecute()) { |
