From 91cf36151663543bffcecaf01d4b6dcef2aa0f2b Mon Sep 17 00:00:00 2001 From: David Goodwin Date: Mon, 20 Jul 2009 17:15:03 +0000 Subject: For remote execution, must cd to the executable directory since the exe expects to find a dylib in the CWD ('.'). git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@76432 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/bugpoint/ToolRunner.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/bugpoint/ToolRunner.cpp b/tools/bugpoint/ToolRunner.cpp index e6db42a08b..ef07079af3 100644 --- a/tools/bugpoint/ToolRunner.cpp +++ b/tools/bugpoint/ToolRunner.cpp @@ -688,7 +688,6 @@ int GCC::ExecuteProgram(const std::string &ProgramFile, std::vector ProgramArgs; - std::string Exec; if (RemoteClientPath.isEmpty()) ProgramArgs.push_back(OutputBinary.c_str()); else { @@ -704,10 +703,12 @@ int GCC::ExecuteProgram(const std::string &ProgramFile, ProgramArgs.push_back(RemoteExtra.c_str()); } - // Full path to the binary + // Full path to the binary. We need to cd to the exec directory because + // there is a dylib there that the exec expects to find in the CWD char* env_pwd = getenv("PWD"); + std::string Exec = "cd "; Exec += env_pwd; - Exec += "/"; + Exec += "; ./"; Exec += OutputBinary.c_str(); ProgramArgs.push_back(Exec.c_str()); } -- cgit v1.2.3