mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert back to LlvmArchiveBuilder on all platforms

Browse Source 
ArArchiveBuilder doesn't support reading thin archives, causing a
regression.
This commit is contained in:
bjorn3 2023-01-27 11:48:36 +00:00
parent 2cf101c3e7
commit de363d54c4
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_codegen_llvm/src/back/archive.rs
View File

@ -108,7 +108,9 @@ pub struct LlvmArchiveBuilderBuilder;
impl ArchiveBuilderBuilder for LlvmArchiveBuilderBuilder { impl ArchiveBuilderBuilder for LlvmArchiveBuilderBuilder {
fn new_archive_builder<'a>(&self, sess: &'a Session) -> Box<dyn ArchiveBuilder<'a> + 'a> { 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() }) Box::new(LlvmArchiveBuilder { sess, additions: Vec::new() })
} else { } else {
Box::new(ArArchiveBuilder::new(sess, get_llvm_object_symbols)) Box::new(ArArchiveBuilder::new(sess, get_llvm_object_symbols))