Skip to content

Commit 1bc0447

Browse files
committed
[LLVM-3.9] Maintain backward compatibility in Archiver
1 parent deafab1 commit 1bc0447

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

src/rustllvm/ArchiveWrapper.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,12 @@ LLVMRustWriteArchive(char *Dst,
158158
const LLVMRustArchiveMember **NewMembers,
159159
bool WriteSymbtab,
160160
Archive::Kind Kind) {
161+
162+
#if LLVM_VERSION_MINOR >= 9
161163
std::vector<NewArchiveMember> Members;
164+
#else
165+
std::vector<NewArchiveIterator> Members;
166+
#endif
162167

163168
for (size_t i = 0; i < NumMembers; i++) {
164169
auto Member = NewMembers[i];
@@ -171,6 +176,8 @@ LLVMRustWriteArchive(char *Dst,
171176
return -1;
172177
}
173178
Members.push_back(std::move(*MOrErr));
179+
#elif LLVM_VERSION_MINOR == 8
180+
Members.push_back(NewArchiveIterator(Member->filename));
174181
#else
175182
Members.push_back(NewArchiveIterator(Member->filename, Member->name));
176183
#endif

0 commit comments

Comments
 (0)