rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[LLVM-3.9] Maintain backward compatibility in Archiver

Browse Source
This commit is contained in:
Jan-Erik Rediger
2016-07-14 21:27:14 +02:00
parent deafab19be
commit 1bc0447260
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/rustllvm/ArchiveWrapper.cpp
View File

@@ -158,7 +158,12 @@ LLVMRustWriteArchive(char *Dst,
const LLVMRustArchiveMember **NewMembers,
bool WriteSymbtab,
Archive::Kind Kind) {
#if LLVM_VERSION_MINOR >= 9
std::vector<NewArchiveMember> Members;
#else
std::vector<NewArchiveIterator> Members;
#endif
for (size_t i = 0; i < NumMembers; i++) {
auto Member = NewMembers[i];
@@ -171,6 +176,8 @@ LLVMRustWriteArchive(char *Dst,
return -1;
}
Members.push_back(std::move(*MOrErr));
#elif LLVM_VERSION_MINOR == 8
Members.push_back(NewArchiveIterator(Member->filename));
#else
Members.push_back(NewArchiveIterator(Member->filename, Member->name));
#endif