diff options
| author | bors <bors@rust-lang.org> | 2023-02-07 06:43:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-02-07 06:43:12 +0000 |
| commit | d5a82bbd26e1ad8b7401f6a718a9c57c96905483 (patch) | |
| tree | 38c72258d20c6cb5a74e92012a9a5d157284edcc /compiler/rustc_codegen_llvm/src/back | |
| parent | fc594f15669680fa70d255faec3ca3fb507c3405 (diff) | |
| parent | 2242436183f2a8aacab2706a00c06244aa409220 (diff) | |
| download | rust-1.67.1.tar.gz rust-1.67.1.zip | |
Auto merge of #107743 - cuviper:stable-1.67.1, r=Mark-Simulacrum 1.67.1
Release 1.67.1 - Revert back to LlvmArchiveBuilder on all platforms #107360 - 🚨 fix unsoundness in bootstrap cache code #105624 - Mark uninlined_format_args as pedantic rust-lang/rust-clippy#10265 - Revert "switch to the macos-12-xl builder" #107574 r? `@Mark-Simulacrum`
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/back')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/back/archive.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/back/archive.rs b/compiler/rustc_codegen_llvm/src/back/archive.rs index 0aee1a1439b..2cf2f585f21 100644 --- a/compiler/rustc_codegen_llvm/src/back/archive.rs +++ b/compiler/rustc_codegen_llvm/src/back/archive.rs @@ -108,7 +108,9 @@ pub struct LlvmArchiveBuilderBuilder; impl ArchiveBuilderBuilder for LlvmArchiveBuilderBuilder { fn new_archive_builder<'a>(&self, sess: &'a Session) -> Box<dyn ArchiveBuilder<'a> + 'a> { - if sess.target.arch == "wasm32" || sess.target.arch == "wasm64" { + // FIXME use ArArchiveBuilder on most targets again once reading thin archives is + // implemented + if true || sess.target.arch == "wasm32" || sess.target.arch == "wasm64" { Box::new(LlvmArchiveBuilder { sess, additions: Vec::new() }) } else { Box::new(ArArchiveBuilder::new(sess, get_llvm_object_symbols)) |