mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-14 15:16:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify code for LLVM 3.4.

Browse source 
Introduces a compability function instead of a #if/#endif cascade.
This commit is contained in:
kai 2013-06-16 17:59:52 +02:00
parent 683294cec9
commit e556882be4
1 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
gen/programs.cpp
View file

@ -39,33 +39,30 @@ static cl::opt<std::string> mslib("ms-lib",
typedef std::string RetType;
#else
typedef sys::Path RetType;
namespace llvm {
namespace sys {
inline sys::Path FindProgramByName(const std::string& name)
{
return llvm::sys::Program::FindProgramByName(name);
}
} // namespace sys
} // namespace llvm
#endif
RetType getProgram(const char *name, const cl::opt<std::string> &opt, const char *envVar = 0)
static RetType getProgram(const char *name, const cl::opt<std::string> &opt, const char *envVar = 0)
{
RetType path;
const char *prog = NULL;
if (opt.getNumOccurrences() > 0 && opt.length() > 0 && (prog = opt.c_str()))
#if LDC_LLVM_VER >= 304
path = sys::FindProgramByName(prog);
#else
path = sys::Program::FindProgramByName(prog);
#endif
if (path.empty() && envVar && (prog = getenv(envVar)))
#if LDC_LLVM_VER >= 304
path = sys::FindProgramByName(prog);
#else
path = sys::Program::FindProgramByName(prog);
#endif
if (path.empty())
#if LDC_LLVM_VER >= 304
path = sys::FindProgramByName(name);
#else
path = sys::Program::FindProgramByName(name);
#endif
if (path.empty()) {
error("failed to locate %s", name);