diff options
| author | bors <bors@rust-lang.org> | 2018-11-11 22:38:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-11-11 22:38:54 +0000 |
| commit | 775eab58835f9bc0f1f01ccbb79725dce0c73b51 (patch) | |
| tree | cdedaeb84917423b570a30903ef25ae8dcd80ab1 /src/rustllvm/ArchiveWrapper.cpp | |
| parent | ca79ecd6940e30d4b2466bf378632efcdf5745c7 (diff) | |
| parent | 3cc8b17451aac4a144baa48bb48f4187a5529769 (diff) | |
| download | rust-775eab58835f9bc0f1f01ccbb79725dce0c73b51.tar.gz rust-775eab58835f9bc0f1f01ccbb79725dce0c73b51.zip | |
Auto merge of #55698 - nikic:remove-llvm-4-support, r=alexcrichton
Remove support for building against LLVM 4 With emscripten removed in #55626, we no longer need to support building against LLVM 4.
Diffstat (limited to 'src/rustllvm/ArchiveWrapper.cpp')
| -rw-r--r-- | src/rustllvm/ArchiveWrapper.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/rustllvm/ArchiveWrapper.cpp b/src/rustllvm/ArchiveWrapper.cpp index 390450a5205..1355c0377ce 100644 --- a/src/rustllvm/ArchiveWrapper.cpp +++ b/src/rustllvm/ArchiveWrapper.cpp @@ -204,9 +204,7 @@ LLVMRustWriteArchive(char *Dst, size_t NumMembers, LLVMRustSetLastError(toString(MOrErr.takeError()).c_str()); return LLVMRustResult::Failure; } -#if LLVM_VERSION_GE(5, 0) MOrErr->MemberName = sys::path::filename(MOrErr->MemberName); -#endif Members.push_back(std::move(*MOrErr)); } else { Expected<NewArchiveMember> MOrErr = |