@@ -79,11 +79,11 @@ extern "C" RustArchiveIterator*
79
79
LLVMRustArchiveIteratorNew (RustArchive *ra) {
80
80
Archive *ar = ra->getBinary ();
81
81
RustArchiveIterator *rai = new RustArchiveIterator ();
82
- #if LLVM_VERSION_MINOR >= 9
82
+ #if LLVM_VERSION_MINOR <= 8
83
+ rai->cur = ar->child_begin ();
84
+ #else
83
85
Error err;
84
86
rai->cur = ar->child_begin (err);
85
- #else
86
- rai->cur = ar->child_begin ();
87
87
#endif
88
88
rai->end = ar->child_end ();
89
89
return rai;
@@ -164,10 +164,10 @@ LLVMRustWriteArchive(char *Dst,
164
164
bool WriteSymbtab,
165
165
Archive::Kind Kind) {
166
166
167
- #if LLVM_VERSION_MINOR >= 9
168
- std::vector<NewArchiveMember> Members;
169
- #else
167
+ #if LLVM_VERSION_MINOR <= 8
170
168
std::vector<NewArchiveIterator> Members;
169
+ #else
170
+ std::vector<NewArchiveMember> Members;
171
171
#endif
172
172
173
173
for (size_t i = 0 ; i < NumMembers; i++) {
@@ -187,15 +187,15 @@ LLVMRustWriteArchive(char *Dst,
187
187
Members.push_back (NewArchiveIterator (Member->filename , Member->name ));
188
188
#endif
189
189
} else {
190
- #if LLVM_VERSION_MINOR >= 9
190
+ #if LLVM_VERSION_MINOR <= 8
191
+ Members.push_back (NewArchiveIterator (Member->child , Member->name ));
192
+ #else
191
193
Expected<NewArchiveMember> MOrErr = NewArchiveMember::getOldMember (Member->child , true );
192
194
if (!MOrErr) {
193
195
LLVMRustSetLastError (toString (MOrErr.takeError ()).c_str ());
194
196
return -1 ;
195
197
}
196
198
Members.push_back (std::move (*MOrErr));
197
- #else
198
- Members.push_back (NewArchiveIterator (Member->child , Member->name ));
199
199
#endif
200
200
}
201
201
}
0 commit comments