diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-01-27 11:48:36 +0000 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-01-27 11:48:36 +0000 |
| commit | de363d54c40a378717881240e719f5f7223ba376 (patch) | |
| tree | a955f0f57f363b4eeae070159bd9a57c58db72fe /compiler/rustc_codegen_llvm/src/back/archive.rs | |
| parent | 2cf101c3e7d5fffab8f72b1e04224bc3bc2d9e02 (diff) | |
| download | rust-de363d54c40a378717881240e719f5f7223ba376.tar.gz rust-de363d54c40a378717881240e719f5f7223ba376.zip | |
Revert back to LlvmArchiveBuilder on all platforms
ArArchiveBuilder doesn't support reading thin archives, causing a regression.
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/back/archive.rs')
| -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 b00676b7c59..58ca87524de 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)) |