Skip to content

Commit 75625d3

Browse files
bjorn3pnkfelix
authored andcommitted
Revert back to LlvmArchiveBuilder on all platforms
ArArchiveBuilder doesn't support reading thin archives, causing a regression.
1 parent 10b73bf commit 75625d3

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

compiler/rustc_codegen_llvm/src/back/archive.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,9 @@ pub struct LlvmArchiveBuilderBuilder;
102102

103103
impl ArchiveBuilderBuilder for LlvmArchiveBuilderBuilder {
104104
fn new_archive_builder<'a>(&self, sess: &'a Session) -> Box<dyn ArchiveBuilder<'a> + 'a> {
105-
if sess.target.arch == "wasm32" || sess.target.arch == "wasm64" {
105+
// FIXME use ArArchiveBuilder on most targets again once reading thin archives is
106+
// implemented
107+
if true || sess.target.arch == "wasm32" || sess.target.arch == "wasm64" {
106108
Box::new(LlvmArchiveBuilder { sess, additions: Vec::new() })
107109
} else {
108110
Box::new(ArArchiveBuilder::new(sess, get_llvm_object_symbols))

0 commit comments

Comments
 (0)