Bump minimum required LLVM version to 6.0

2018-12-09 11:20:20 +01:00
parent b7da2c6e12
commit 706e67b0a0
19 changed files with 14 additions and 65 deletions
--- a/src/rustllvm/ArchiveWrapper.cpp
+++ b/src/rustllvm/ArchiveWrapper.cpp
@@ -216,16 +216,11 @@ LLVMRustWriteArchive(char *Dst, size_t NumMembers,
      Members.push_back(std::move(*MOrErr));
    }
  }
+
  auto Result = writeArchive(Dst, Members, WriteSymbtab, Kind, true, false);
-#if LLVM_VERSION_GE(6, 0)
  if (!Result)
    return LLVMRustResult::Success;
  LLVMRustSetLastError(toString(std::move(Result)).c_str());
-#else
-  if (!Result.second)
-    return LLVMRustResult::Success;
-  LLVMRustSetLastError(Result.second.message().c_str());
-#endif

  return LLVMRustResult::Failure;
 }