OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

auto merge of #5332 : jdm/rust/transitivelink, r=graydon

Browse Source 
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.
This commit is contained in:
bors 2013-03-12 11:06:55 -07:00
commit ece098667d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/librustc/back/link.rs
View File

@ -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);
}
}
}