diff options
| author | bors <bors@rust-lang.org> | 2017-07-23 01:57:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-07-23 01:57:37 +0000 |
| commit | ef19bd1a339212f77160f12af6d5d85d8bb36ea4 (patch) | |
| tree | c512dc5b3d68aa97934766c72e4e7caaa735873e /src/rustllvm/ArchiveWrapper.cpp | |
| parent | c35a0c1d053040381959a9d84b150f64764e53e4 (diff) | |
| parent | 38e40ce50653b8164915b8142e883c5a57b33e7b (diff) | |
| download | rust-ef19bd1a339212f77160f12af6d5d85d8bb36ea4.tar.gz rust-ef19bd1a339212f77160f12af6d5d85d8bb36ea4.zip | |
Auto merge of #43387 - TimNN:rustllvm50, r=alexcrichton
Update Rust LLVM bindings for LLVM 5.0 This is the initial set of changes to update the rust llvm bindings for 5.0. The llvm commits necessitating these changes are linked from the tracking issue, #43370.
Diffstat (limited to 'src/rustllvm/ArchiveWrapper.cpp')
| -rw-r--r-- | src/rustllvm/ArchiveWrapper.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/rustllvm/ArchiveWrapper.cpp b/src/rustllvm/ArchiveWrapper.cpp index f04251136f4..7f76861c077 100644 --- a/src/rustllvm/ArchiveWrapper.cpp +++ b/src/rustllvm/ArchiveWrapper.cpp @@ -12,6 +12,7 @@ #include "llvm/Object/Archive.h" #include "llvm/Object/ArchiveWriter.h" +#include "llvm/Support/Path.h" using namespace llvm; using namespace llvm::object; @@ -256,6 +257,9 @@ LLVMRustWriteArchive(char *Dst, size_t NumMembers, LLVMRustSetLastError(toString(MOrErr.takeError()).c_str()); return LLVMRustResult::Failure; } +#if LLVM_VERSION_GE(5, 0) + MOrErr->MemberName = sys::path::filename(MOrErr->MemberName); +#endif Members.push_back(std::move(*MOrErr)); #elif LLVM_VERSION_EQ(3, 8) Members.push_back(NewArchiveIterator(Member->Filename)); |