Skip to content

Commit

Permalink
auto merge of #5332 : jdm/rust/transitivelink, r=graydon
Browse files Browse the repository at this point in the history
The original change bit Servo because rust-harfbuzz includes libharfbuzz.a in its link_args. This works fine in the rust-harfbuzz subdirectory where the static library resides, but when this is propagated to servo_gfx, the lirbrary can no longer be found since it's a relative path.
  • Loading branch information
bors committed Mar 12, 2013
2 parents a9643d3 + 1e1efbf commit ece0986
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/librustc/back/link.rs
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,11 @@ pub fn link_binary(sess: Session,
do cstore::iter_crate_data(cstore) |crate_num, _| {
let link_args = csearch::get_link_args_for_crate(cstore, crate_num);
do vec::consume(link_args) |_, link_arg| {
cc_args.push(link_arg);
// Linker arguments that don't begin with - are likely file names,
// so they should not be necessary.
if link_arg.starts_with("-") {
cc_args.push(link_arg);
}
}
}

Expand Down

0 comments on commit ece0986

Please sign in to comment.