mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-10-06 14:57:41 +00:00
Move GetEXESuffix to the one place it is used.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@184853 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
deeb5724b8
commit
46fa7cf91a
@ -104,12 +104,6 @@ namespace sys {
|
|||||||
/// @brief Returns the current working directory.
|
/// @brief Returns the current working directory.
|
||||||
static Path GetCurrentDirectory();
|
static Path GetCurrentDirectory();
|
||||||
|
|
||||||
/// Return the suffix commonly used on file names that contain an
|
|
||||||
/// executable.
|
|
||||||
/// @returns The executable file suffix for the current platform.
|
|
||||||
/// @brief Return the executable file suffix.
|
|
||||||
static StringRef GetEXESuffix();
|
|
||||||
|
|
||||||
/// GetMainExecutable - Return the path to the main executable, given the
|
/// GetMainExecutable - Return the path to the main executable, given the
|
||||||
/// value of argv[0] from program startup and the address of main itself.
|
/// value of argv[0] from program startup and the address of main itself.
|
||||||
/// In extremis, this function may fail and return an empty path.
|
/// In extremis, this function may fail and return an empty path.
|
||||||
|
@ -81,10 +81,6 @@ inline bool lastIsSlash(const std::string& path) {
|
|||||||
namespace llvm {
|
namespace llvm {
|
||||||
using namespace sys;
|
using namespace sys;
|
||||||
|
|
||||||
StringRef Path::GetEXESuffix() {
|
|
||||||
return StringRef();
|
|
||||||
}
|
|
||||||
|
|
||||||
Path::Path(StringRef p)
|
Path::Path(StringRef p)
|
||||||
: path(p) {}
|
: path(p) {}
|
||||||
|
|
||||||
|
@ -42,10 +42,6 @@ static void FlipBackSlashes(std::string& s) {
|
|||||||
namespace llvm {
|
namespace llvm {
|
||||||
namespace sys {
|
namespace sys {
|
||||||
|
|
||||||
StringRef Path::GetEXESuffix() {
|
|
||||||
return "exe";
|
|
||||||
}
|
|
||||||
|
|
||||||
Path::Path(llvm::StringRef p)
|
Path::Path(llvm::StringRef p)
|
||||||
: path(p) {
|
: path(p) {
|
||||||
FlipBackSlashes(path);
|
FlipBackSlashes(path);
|
||||||
|
@ -234,6 +234,12 @@ int LLI::ExecuteProgram(const std::string &Bitcode,
|
|||||||
|
|
||||||
void AbstractInterpreter::anchor() { }
|
void AbstractInterpreter::anchor() { }
|
||||||
|
|
||||||
|
#if defined(LLVM_ON_UNIX)
|
||||||
|
const char EXESuffix[] = "";
|
||||||
|
#elif defined (LLVM_ON_WIN32)
|
||||||
|
const char EXESuffix[] = "exe";
|
||||||
|
#endif
|
||||||
|
|
||||||
/// Prepend the path to the program being executed
|
/// Prepend the path to the program being executed
|
||||||
/// to \p ExeName, given the value of argv[0] and the address of main()
|
/// to \p ExeName, given the value of argv[0] and the address of main()
|
||||||
/// itself. This allows us to find another LLVM tool if it is built in the same
|
/// itself. This allows us to find another LLVM tool if it is built in the same
|
||||||
@ -252,7 +258,7 @@ static std::string PrependMainExecutablePath(const std::string &ExeName,
|
|||||||
if (!Result.empty()) {
|
if (!Result.empty()) {
|
||||||
SmallString<128> Storage = Result;
|
SmallString<128> Storage = Result;
|
||||||
sys::path::append(Storage, ExeName);
|
sys::path::append(Storage, ExeName);
|
||||||
sys::path::replace_extension(Storage, sys::Path::GetEXESuffix());
|
sys::path::replace_extension(Storage, EXESuffix);
|
||||||
return Storage.str();
|
return Storage.str();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user