Skip to content

Commit fb217af

Browse files
alexcrichtonTimNN
authored andcommitted
Fix archive member names on 5.0
1 parent b022d54 commit fb217af

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

src/rustllvm/ArchiveWrapper.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
#include "llvm/Object/Archive.h"
1414
#include "llvm/Object/ArchiveWriter.h"
15+
#include "llvm/Support/Path.h"
1516

1617
using namespace llvm;
1718
using namespace llvm::object;
@@ -256,6 +257,9 @@ LLVMRustWriteArchive(char *Dst, size_t NumMembers,
256257
LLVMRustSetLastError(toString(MOrErr.takeError()).c_str());
257258
return LLVMRustResult::Failure;
258259
}
260+
#if LLVM_VERSION_GE(5, 0)
261+
MOrErr->MemberName = sys::path::filename(MOrErr->MemberName);
262+
#endif
259263
Members.push_back(std::move(*MOrErr));
260264
#elif LLVM_VERSION_EQ(3, 8)
261265
Members.push_back(NewArchiveIterator(Member->Filename));

0 commit comments

Comments
 (0)