auto merge of #11604 : alexcrichton/rust/issue-11162, r=brson

Apparently this isn't necessary, and it's just causing problems.

Closes #11162

1 files changed, 7 insertions, 4 deletions

diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs
index 65195468ed3..9e1e1f7bd34 100644
--- a/src/librustc/back/link.rs
+++ b/src/librustc/back/link.rs
@@ -924,10 +924,13 @@ fn link_rlib(sess: Session,
                 fs::unlink(&bc);
             }
 
-            // Now that we've added files, some platforms need us to now update
-            // the symbol table in the archive (because some platforms die when
-            // adding files to the archive without symbols).
-            a.update_symbols();
+            // After adding all files to the archive, we need to update the
+            // symbol table of the archive. This currently dies on OSX (see
+            // #11162), and isn't necessary there anyway
+            match sess.targ_cfg.os {
+                abi::OsMacos => {}
+                _ => { a.update_symbols(); }
+            }
         }
 
         None => {}