fix LLVM 3.5 regression introduced by 0d168ed

This commit is contained in:
Andreas Hollandt 2014-07-21 18:29:31 +02:00
parent 58060434b3
commit 7524bff42b

View file

@ -989,7 +989,7 @@ std::string locateBinary(std::string exeName, const char* argv0)
*/ */
static void createOutputDir(const char* dir) { static void createOutputDir(const char* dir) {
#if LDC_LLVM_VER >= 305 #if LDC_LLVM_VER >= 305
if (!ls::fs::create_directories(dir)) if (ls::fs::create_directories(dir))
#else #else
bool dirExisted; // ignored bool dirExisted; // ignored
if (ls::fs::create_directories(dir, dirExisted) != llvm::errc::success) if (ls::fs::create_directories(dir, dirExisted) != llvm::errc::success)
@ -1046,7 +1046,7 @@ int main(int argc, char *argv[])
{ {
int rspFd; int rspFd;
llvm::SmallString<128> rspPath; llvm::SmallString<128> rspPath;
if (!ls::fs::createUniqueFile("ldmd-%%-%%-%%-%%.rsp", rspFd, rspPath)) if (ls::fs::createUniqueFile("ldmd-%%-%%-%%-%%.rsp", rspFd, rspPath))
{ {
error("Could not open temporary response file."); error("Could not open temporary response file.");
} }
@ -1071,7 +1071,7 @@ int main(int argc, char *argv[])
int rc = execute(ldcPath, &newArgs[0]); int rc = execute(ldcPath, &newArgs[0]);
#if LDC_LLVM_VER >= 305 #if LDC_LLVM_VER >= 305
if (!ls::fs::remove(rspPath.str())) if (ls::fs::remove(rspPath.str()))
#else #else
bool couldRemove; bool couldRemove;
if (ls::fs::remove(rspPath.str(), couldRemove) != llvm::errc::success || if (ls::fs::remove(rspPath.str(), couldRemove) != llvm::errc::success ||