Auto merge of #102340 - JakobDegen:pass-manager-simplification, r=oli-obk

[rust.git] / compiler / rustc_codegen_cranelift / src / archive.rs

diff --git a/compiler/rustc_codegen_cranelift/src/archive.rs b/compiler/rustc_codegen_cranelift/src/archive.rs
index b4c790961707900f839ad4977a89d5e725cf9f69..f2e3bf16e61842bae2d73b66ac42c0cec2a01e6e 100644 (file)
--- a/compiler/rustc_codegen_cranelift/src/archive.rs
+++ b/compiler/rustc_codegen_cranelift/src/archive.rs
@@ -38,6 +38,7 @@ fn create_dll_import_lib(
         _lib_name: &str,
         _dll_imports: &[rustc_session::cstore::DllImport],
         _tmpdir: &Path,
+        _is_direct_dependency: bool,
     ) -> PathBuf {
         bug!("creating dll imports is not supported");
     }
@@ -159,6 +160,8 @@ enum BuilderKind {
                         let err = err.to_string();
                         if err == "Unknown file magic" {
                             // Not an object file; skip it.
+                        } else if object::read::archive::ArchiveFile::parse(&*data).is_ok() {
+                            // Nested archive file; skip it.
                         } else {
                             sess.fatal(&format!(
                                 "error parsing `{}` during archive creation: {}",