6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-28 19:31:58 +00:00
Code Issues Projects Releases Wiki Activity

FindExecutable: remove the executability check.

Browse Source 
This makes the behaviour of FindExecutable more consistent across platforms, but
I'm not very happy with the name...

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@118049 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Mikhail Glushenkov 2010-11-02 20:32:46 +00:00
parent 9cd5971228
commit 345b344e64
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/llvm/Support/SystemUtils.h
View File

@ -30,10 +30,10 @@ bool CheckBitcodeOutputToConsole(
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);

22
lib/Support/SystemUtils.cpp
View File

@ -32,11 +32,10 @@ bool llvm::CheckBitcodeOutputToConsole(raw_ostream &stream_to_check,
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 @@ sys::Path llvm::FindExecutable(const std::string &ExeName,
// 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;