about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbjorn3 <17426603+bjorn3@users.noreply.github.com>2022-09-15 16:05:27 +0000
committerbjorn3 <17426603+bjorn3@users.noreply.github.com>2022-09-15 16:05:27 +0000
commitb023e2f7d04d6f7707e4dd05ab133e56e9f4ff51 (patch)
tree9708daba3f06b09795c065933f1148e9bff09f5e /src
parent879c86ff3088c70725dcbeed0430e497f970b8bd (diff)
downloadrust-b023e2f7d04d6f7707e4dd05ab133e56e9f4ff51.tar.gz
rust-b023e2f7d04d6f7707e4dd05ab133e56e9f4ff51.zip
Fix bundled static libraries
Diffstat (limited to 'src')
-rw-r--r--src/archive.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/archive.rs b/src/archive.rs
index b4c79096170..31d3d0e0615 100644
--- a/src/archive.rs
+++ b/src/archive.rs
@@ -159,6 +159,8 @@ impl<'a> ArchiveBuilder<'a> for ArArchiveBuilder<'a> {
                         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: {}",