diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-12-09 11:20:20 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-12-09 12:05:40 +0100 |
| commit | 706e67b0a0143d651eb03f2fa2c30645899e81ff (patch) | |
| tree | 4233ab3b0967f2b313cd9100e1a2eeb4d0b97e7c /src/rustllvm/ArchiveWrapper.cpp | |
| parent | b7da2c6e12a6b2a2343e2f1e66fe4f6a1ad55463 (diff) | |
| download | rust-706e67b0a0143d651eb03f2fa2c30645899e81ff.tar.gz rust-706e67b0a0143d651eb03f2fa2c30645899e81ff.zip | |
Bump minimum required LLVM version to 6.0
Diffstat (limited to 'src/rustllvm/ArchiveWrapper.cpp')
| -rw-r--r-- | src/rustllvm/ArchiveWrapper.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/rustllvm/ArchiveWrapper.cpp b/src/rustllvm/ArchiveWrapper.cpp index 1355c0377ce..2f8dc0d466f 100644 --- 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; } |