[LLVM-3.9] Maintain backward compatibility in Archiver

rust-lang · Jul 29, 2016 · 1bc0447 · 1bc0447
1 parent deafab1
commit 1bc0447
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/rustllvm/ArchiveWrapper.cpp b/src/rustllvm/ArchiveWrapper.cpp
@@ -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