From 1bc04472609aec664ce434f7a3b7df7e06e80637 Mon Sep 17 00:00:00 2001
From: Jan-Erik Rediger <janerik@fnordig.de>
Date: Thu, 14 Jul 2016 21:27:14 +0200
Subject: [PATCH] [LLVM-3.9] Maintain backward compatibility in Archiver

---
 src/rustllvm/ArchiveWrapper.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/rustllvm/ArchiveWrapper.cpp b/src/rustllvm/ArchiveWrapper.cpp
index 514d25297ee2..03b0aaf45b81 100644
--- 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