about summary refs log tree commit diff
path: root/compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp
diff options
context:
space:
mode:
authorLaurențiu Nicola <lnicola@dend.ro>2024-09-25 09:00:53 +0300
committerLaurențiu Nicola <lnicola@dend.ro>2024-09-25 09:00:53 +0300
commited7150f2af189fd5b55e62c8ef49b00d70ba5d16 (patch)
tree4060e6944f4d29bc9b40ae95b359db057dca6fa1 /compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp
parent96736aeaeebf241a686fd906fb839e27ff93fab9 (diff)
parent1b5aa96d6016bafe50e071b45d4d2e3c90fd766f (diff)
downloadrust-ed7150f2af189fd5b55e62c8ef49b00d70ba5d16.tar.gz
rust-ed7150f2af189fd5b55e62c8ef49b00d70ba5d16.zip
Merge from rust-lang/rust
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp')
-rw-r--r--compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp4
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());