23df2b257f
One fix to a problem that broke mesa build, and one fix to a problem that broke rust bootstrap.
27 lines
1.3 KiB
Diff
27 lines
1.3 KiB
Diff
From de363d54c40a378717881240e719f5f7223ba376 Mon Sep 17 00:00:00 2001
|
|
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
|
|
Date: Fri, 27 Jan 2023 11:48:36 +0000
|
|
Subject: [PATCH 3/4] Revert back to LlvmArchiveBuilder on all platforms
|
|
|
|
ArArchiveBuilder doesn't support reading thin archives, causing a
|
|
regression.
|
|
---
|
|
compiler/rustc_codegen_llvm/src/back/archive.rs | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/compiler/rustc_codegen_llvm/src/back/archive.rs b/compiler/rustc_codegen_llvm/src/back/archive.rs
|
|
index b00676b7c592b..58ca87524deb6 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))
|