RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-02-01 05:01:59 +01:00
Code Issues Projects Releases Wiki Activity

Fix FindExecutable to work if given an absolute executable path name.

Browse Source 
- Patch by Viktor Kutuzov, with tweaks by me.

llvm-svn: 74608
This commit is contained in:
Daniel Dunbar 2009-07-01 15:26:13 +00:00
parent 351a228c46
commit 2b25b9ba77
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Support/SystemUtils.cpp
View File

@ -38,15 +38,20 @@ bool llvm::CheckBitcodeOutputToConsole(std::ostream* stream_to_check,
/// being executed. This allows us to find another LLVM tool if it is built /// being executed. This allows us to find another LLVM tool if it is built
/// into the same directory, but that directory is neither the current /// into the same directory, but that directory is neither the current
/// directory, nor in the PATH. If the executable cannot be found, return an /// directory, nor in the PATH. If the executable cannot be found, return an
/// empty string. /// empty string. Return the input string if given a full path to an executable.
/// ///
#undef FindExecutable // needed on windows :( #undef FindExecutable // needed on windows :(
sys::Path llvm::FindExecutable(const std::string &ExeName, sys::Path llvm::FindExecutable(const std::string &ExeName,
const std::string &ProgramPath) { const std::string &ProgramPath) {
// First check the directory that the calling program is in. We can do this // First check if the given name is a fully qualified path to an executable
// if ProgramPath contains at least one / character, indicating that it is a sys::Path Result(ExeName);
// relative path to bugpoint itself. if (Result.isAbsolute() && Result.canExecute())
sys::Path Result ( ProgramPath ); return Result;
// Otherwise check the directory that the calling program is in. We can do
// this if ProgramPath contains at least one / character, indicating that it
// is a relative path to bugpoint itself.
Result = ProgramPath;
Result.eraseComponent(); Result.eraseComponent();
if (!Result.isEmpty()) { if (!Result.isEmpty()) {
Result.appendComponent(ExeName); Result.appendComponent(ExeName);