diff options
author | Chris Lattner <sabre@nondot.org> | 2010-08-24 17:44:07 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2010-08-24 17:44:07 +0000 |
commit | a69e6701a4179dfa321c16a78853284a3fed51e6 (patch) | |
tree | 11730bb535c2c43877cfcf86d0f2375c23c39bdc /tools/bugpoint/OptimizerDriver.cpp | |
parent | 2f6e0e68a455aa6bd6da74c3256470bd94c0b6f2 (diff) | |
download | llvm-a69e6701a4179dfa321c16a78853284a3fed51e6.tar.gz llvm-a69e6701a4179dfa321c16a78853284a3fed51e6.tar.bz2 llvm-a69e6701a4179dfa321c16a78853284a3fed51e6.tar.xz |
Apply "Win32's Hybrid path separator in argv[0] should be accepted to bugpoint",
patch by NAKAMURA Takumi!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@111929 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/bugpoint/OptimizerDriver.cpp')
-rw-r--r-- | tools/bugpoint/OptimizerDriver.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/tools/bugpoint/OptimizerDriver.cpp b/tools/bugpoint/OptimizerDriver.cpp index 6d37761bcd..8f5ab722f0 100644 --- a/tools/bugpoint/OptimizerDriver.cpp +++ b/tools/bugpoint/OptimizerDriver.cpp @@ -27,6 +27,7 @@ #include "llvm/Target/TargetData.h" #include "llvm/Support/FileUtilities.h" #include "llvm/Support/CommandLine.h" +#include "llvm/Support/SystemUtils.h" #include "llvm/Support/Debug.h" #include "llvm/Support/raw_ostream.h" #include "llvm/System/Path.h" @@ -150,16 +151,8 @@ bool BugDriver::runPasses(Module *Program, // setup the child process' arguments SmallVector<const char*, 8> Args; - std::string Opt; - llvm::StringRef TN(ToolName); - if (TN.find('/') == llvm::StringRef::npos) { - Opt = "opt"; - } else { - std::pair<llvm::StringRef, llvm::StringRef> P = TN.rsplit('/'); - Opt = P.first.str() + "/" + "opt"; - } - - sys::Path tool = sys::Program::FindProgramByName(Opt); + sys::Path tool = FindExecutable("opt", getToolName(), (void*)"opt"); + std::string Opt = tool.str(); if (UseValgrind) { Args.push_back("valgrind"); Args.push_back("--error-exitcode=1"); |