diff options
| author | bors <bors@rust-lang.org> | 2023-08-23 16:10:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-08-23 16:10:43 +0000 |
| commit | 8e8231f64eb81094222483a7dca9ef507891eaed (patch) | |
| tree | 2d77826cf8859bdda7c5b9592f72c615a7e83bce /compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp | |
| parent | 97fff1f2ed01f6f7c0c204530b693c74d88c2105 (diff) | |
| parent | 5cbc00fb7ed54e90623138b8dfe4d62669270965 (diff) | |
| download | rust-8e8231f64eb81094222483a7dca9ef507891eaed.tar.gz rust-8e8231f64eb81094222483a7dca9ef507891eaed.zip | |
Auto merge of #115137 - GuillaumeGomez:rollup-37jqoyg, r=GuillaumeGomez
Rollup of 6 pull requests Successful merges: - #114696 (Fix a pthread_t handle leak #114610) - #115102 (Improve note for the `invalid_reference_casting` lint) - #115103 (Disable bootstrap rustc version check) - #115106 (ArchiveWrapper: handle LLVM API update) - #115109 (Skip ExpandYamlAnchors when the config is missing) - #115135 (Rustdoc: Add unstable --no-html-source flag) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp')
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp index 35d6b9ed7a4..54fdc84c77d 100644 --- a/compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp @@ -203,7 +203,12 @@ LLVMRustWriteArchive(char *Dst, size_t NumMembers, } } +#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); +#endif if (!Result) return LLVMRustResult::Success; LLVMRustSetLastError(toString(std::move(Result)).c_str()); |