From f439aeef070da498f5a75b7cf17080bde0e72738 Mon Sep 17 00:00:00 2001
From: Jan-Erik Rediger <janerik@fnordig.de>
Date: Sat, 16 Jul 2016 19:36:51 +0200
Subject: [PATCH] [LLVM-3.9] Use old way of getting next child

This was changed back in
https://github.com/rust-lang/llvm/commit/aacf2fbf
---
 src/rustllvm/ArchiveWrapper.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/rustllvm/ArchiveWrapper.cpp b/src/rustllvm/ArchiveWrapper.cpp
index 03b0aaf45b8..b6d352e4516 100644
--- a/src/rustllvm/ArchiveWrapper.cpp
+++ b/src/rustllvm/ArchiveWrapper.cpp
@@ -79,7 +79,12 @@ extern "C" RustArchiveIterator*
 LLVMRustArchiveIteratorNew(RustArchive *ra) {
     Archive *ar = ra->getBinary();
     RustArchiveIterator *rai = new RustArchiveIterator();
+#if LLVM_VERSION_MINOR >= 9
+    Error err;
+    rai->cur = ar->child_begin(err);
+#else
     rai->cur = ar->child_begin();
+#endif
     rai->end = ar->child_end();
     return rai;
 }
@@ -88,8 +93,8 @@ extern "C" const Archive::Child*
 LLVMRustArchiveIteratorNext(RustArchiveIterator *rai) {
     if (rai->cur == rai->end)
         return NULL;
-#if LLVM_VERSION_MINOR >= 8
-    const ErrorOr<Archive::Child>* cur = rai->cur.operator->();
+#if LLVM_VERSION_MINOR == 8
+    Archive::Child* cur = rai->cur.operator->();
     if (!*cur) {
         LLVMRustSetLastError(cur->getError().message().c_str());
         return NULL;