[llvm-commits] [llvm] r74608 - /llvm/trunk/lib/Support/SystemUtils.cpp
Daniel Dunbar
daniel at zuster.org
Wed Jul 1 08:26:29 PDT 2009
Author: ddunbar
Date: Wed Jul 1 10:26:13 2009
New Revision: 74608
URL: http://llvm.org/viewvc/llvm-project?rev=74608&view=rev
Log:
Fix FindExecutable to work if given an absolute executable path name.
- Patch by Viktor Kutuzov, with tweaks by me.
Modified:
llvm/trunk/lib/Support/SystemUtils.cpp
Modified: llvm/trunk/lib/Support/SystemUtils.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/SystemUtils.cpp?rev=74608&r1=74607&r2=74608&view=diff
==============================================================================
--- llvm/trunk/lib/Support/SystemUtils.cpp (original)
+++ llvm/trunk/lib/Support/SystemUtils.cpp Wed Jul 1 10:26:13 2009
@@ -38,15 +38,20 @@
/// 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
/// 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 :(
sys::Path llvm::FindExecutable(const std::string &ExeName,
const std::string &ProgramPath) {
- // First 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.
- sys::Path Result ( ProgramPath );
+ // First check if the given name is a fully qualified path to an executable
+ sys::Path Result(ExeName);
+ if (Result.isAbsolute() && Result.canExecute())
+ 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();
if (!Result.isEmpty()) {
Result.appendComponent(ExeName);
More information about the llvm-commits
mailing list