Skip to content

Commit aa67e13

Browse files
committed
auto merge of #11604 : alexcrichton/rust/issue-11162, r=brson
Apparently this isn't necessary, and it's just causing problems. Closes #11162
2 parents 9bf85a2 + 11dcd9a commit aa67e13

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

src/librustc/back/link.rs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -924,10 +924,13 @@ fn link_rlib(sess: Session,
924924
fs::unlink(&bc);
925925
}
926926

927-
// Now that we've added files, some platforms need us to now update
928-
// the symbol table in the archive (because some platforms die when
929-
// adding files to the archive without symbols).
930-
a.update_symbols();
927+
// After adding all files to the archive, we need to update the
928+
// symbol table of the archive. This currently dies on OSX (see
929+
// #11162), and isn't necessary there anyway
930+
match sess.targ_cfg.os {
931+
abi::OsMacos => {}
932+
_ => { a.update_symbols(); }
933+
}
931934
}
932935

933936
None => {}

0 commit comments

Comments
 (0)