diff options
| author | bors <bors@rust-lang.org> | 2024-09-21 07:44:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-09-21 07:44:18 +0000 |
| commit | a3fea24971e748914354acaf90033bbe594a4fa5 (patch) | |
| tree | 2b38cc25ccc76b8bbb92155efbff283d54e33477 /compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp | |
| parent | 3d4d5e1c107b9a90f43426a009904e0a896b2db0 (diff) | |
| parent | 7d9a4a7d3a4ae6298f3aed697dffaaf379308983 (diff) | |
| download | rust-a3fea24971e748914354acaf90033bbe594a4fa5.tar.gz rust-a3fea24971e748914354acaf90033bbe594a4fa5.zip | |
Auto merge of #3901 - RalfJung:rustup, r=RalfJung
Rustup This has a larger large "fmt" diff, probably there was a bug rustfmt update. For some reason the automatic `./miri fmt` on CI failed so this PR had to be created by hand -- it is unclear to me why this occurred.
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp')
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp index a8c278741a7..feac6a5649c 100644 --- a/compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp @@ -196,14 +196,10 @@ extern "C" LLVMRustResult LLVMRustWriteArchive( } } -#if LLVM_VERSION_LT(18, 0) - auto Result = writeArchive(Dst, Members, WriteSymbtab, Kind, true, false); -#else auto SymtabMode = WriteSymbtab ? SymtabWritingMode::NormalSymtab : SymtabWritingMode::NoSymtab; auto Result = writeArchive(Dst, Members, SymtabMode, Kind, true, false, nullptr, isEC); -#endif if (!Result) return LLVMRustResult::Success; LLVMRustSetLastError(toString(std::move(Result)).c_str()); |