]> git.lizzy.rs Git - rust.git/commitdiff
Fix bundled static libraries
authorbjorn3 <17426603+bjorn3@users.noreply.github.com>
Thu, 15 Sep 2022 16:05:27 +0000 (16:05 +0000)
committerbjorn3 <17426603+bjorn3@users.noreply.github.com>
Thu, 15 Sep 2022 16:05:27 +0000 (16:05 +0000)
src/archive.rs

index b4c790961707900f839ad4977a89d5e725cf9f69..31d3d0e06156bf3defc921299d5c61c3604c29ed 100644 (file)
@@ -159,6 +159,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: {}",