[llvm-commits] [llvm] r118049 - in /llvm/trunk: include/llvm/Support/SystemUtils.h lib/Support/SystemUtils.cpp
Mikhail Glushenkov
foldr at codedgers.com
Tue Nov 2 13:32:46 PDT 2010
Author: foldr
Date: Tue Nov 2 15:32:46 2010
New Revision: 118049
URL: http://llvm.org/viewvc/llvm-project?rev=118049&view=rev
Log:
FindExecutable: remove the executability check.
This makes the behaviour of FindExecutable more consistent across platforms, but
I'm not very happy with the name...
Modified:
llvm/trunk/include/llvm/Support/SystemUtils.h
llvm/trunk/lib/Support/SystemUtils.cpp
Modified: llvm/trunk/include/llvm/Support/SystemUtils.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/SystemUtils.h?rev=118049&r1=118048&r2=118049&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/SystemUtils.h (original)
+++ llvm/trunk/include/llvm/Support/SystemUtils.h Tue Nov 2 15:32:46 2010
@@ -30,10 +30,10 @@
bool print_warning = true ///< Control whether warnings are printed
);
-/// FindExecutable - Find a named executable, giving the argv[0] of program
-/// being executed. This allows us to find another LLVM tool if it is built in
-/// the same directory. If the executable cannot be found, return an
-/// empty string.
+/// FindExecutable - Find a named executable, given the value of argv[0] of the
+/// program being executed and the address of main itself. This allows us to
+/// find another LLVM tool if it is built in the same directory. An empty string
+/// is returned on error.
/// @brief Find a named executable.
sys::Path FindExecutable(const std::string &ExeName,
const char *Argv0, void *MainAddr);
Modified: llvm/trunk/lib/Support/SystemUtils.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/SystemUtils.cpp?rev=118049&r1=118048&r2=118049&view=diff
==============================================================================
--- llvm/trunk/lib/Support/SystemUtils.cpp (original)
+++ llvm/trunk/lib/Support/SystemUtils.cpp Tue Nov 2 15:32:46 2010
@@ -32,11 +32,10 @@
return false;
}
-/// FindExecutable - Find a named executable, giving the argv[0] of program
-/// being executed. This allows us to find another LLVM tool if it is built in
-/// the same directory. If the executable cannot be found, return an
-/// empty string.
-/// @brief Find a named executable.
+/// FindExecutable - Find a named executable, given the value of argv[0] of the
+/// program being executed and the address of main itself. This allows us to
+/// find another LLVM tool if it is built in the same directory. An empty string
+/// is returned on error.
#undef FindExecutable // needed on windows :(
sys::Path llvm::FindExecutable(const std::string &ExeName,
const char *Argv0, void *MainAddr) {
@@ -45,19 +44,10 @@
// is a relative path to the executable itself.
sys::Path Result = sys::Path::GetMainExecutable(Argv0, MainAddr);
Result.eraseComponent();
+
if (!Result.isEmpty()) {
Result.appendComponent(ExeName);
- if (Result.canExecute())
- return Result;
- // If the path is absolute (and it usually is), call FindProgramByName to
- // allow it to try platform-specific logic, such as appending a .exe suffix
- // on Windows. Don't do this if we somehow have a relative path, because
- // we don't want to go searching the PATH and accidentally find an unrelated
- // version of the program.
- if (Result.isAbsolute()) {
- Result = sys::Program::FindProgramByName(Result.str());
- return Result;
- }
+ Result.appendSuffix(sys::Path::GetEXESuffix());
}
return Result;
More information about the llvm-commits
mailing list