Skip to content

Commit

Permalink
Don't run 'ar s' on OSX
Browse files Browse the repository at this point in the history
Apparently this isn't necessary, and it's just causing problems.

Closes #11162
  • Loading branch information
alexcrichton committed Jan 16, 2014
1 parent 77eedda commit 11dcd9a
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions src/librustc/back/link.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 => {}
Expand Down

5 comments on commit 11dcd9a

@bors
Copy link
Contributor

@bors bors commented on 11dcd9a Jan 17, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from brson
at alexcrichton@11dcd9a

@bors
Copy link
Contributor

@bors bors commented on 11dcd9a Jan 17, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging alexcrichton/rust/issue-11162 = 11dcd9a into auto

@bors
Copy link
Contributor

@bors bors commented on 11dcd9a Jan 17, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alexcrichton/rust/issue-11162 = 11dcd9a merged ok, testing candidate = aa67e13

@bors
Copy link
Contributor

@bors bors commented on 11dcd9a Jan 17, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 11dcd9a Jan 17, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = aa67e13

Please sign in to comment.