D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-01-15 04:13:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace llvm::sys::Path with std::string.

Browse Source 
In many cases this is straightforward. It makes the source LLVM 3.4 compatible without using #idef's.
This commit is contained in:
kai
2013-06-29 14:20:44 +02:00
parent 7194ccff0c
commit cf88271ab9
6 changed files with 38 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
gen/programs.cpp
View File

@@ -35,24 +35,20 @@ static cl::opt<std::string> mslib("ms-lib",
cl::Hidden,
cl::ZeroOrMore);
#if LDC_LLVM_VER >= 304
typedef std::string RetType;
#else
typedef sys::Path RetType;
#if LDC_LLVM_VER < 304
namespace llvm {
namespace sys {
inline sys::Path FindProgramByName(const std::string& name)
inline std::string FindProgramByName(const std::string& name)
{
return llvm::sys::Program::FindProgramByName(name);
return llvm::sys::Program::FindProgramByName(name).str();
}
} // namespace sys
} // namespace llvm
#endif
static RetType getProgram(const char *name, const cl::opt<std::string> &opt, const char *envVar = 0)
static std::string getProgram(const char *name, const cl::opt<std::string> &opt, const char *envVar = 0)
{
RetType path;
std::string path;
const char *prog = NULL;
if (opt.getNumOccurrences() > 0 && opt.length() > 0 && (prog = opt.c_str()))
@@ -72,22 +68,22 @@ static RetType getProgram(const char *name, const cl::opt<std::string> &opt, con
return path;
}
RetType getGcc()
std::string getGcc()
{
return getProgram("gcc", gcc, "CC");
}
RetType getArchiver()
std::string getArchiver()
{
return getProgram("ar", ar);
}
RetType getLink()
std::string getLink()
{
return getProgram("link.exe", mslink);
}
RetType getLib()
std::string getLib()
{
return getProgram("lib.exe", mslib);
}