Skip to content

Commit

Permalink
Tidy
Browse files Browse the repository at this point in the history
  • Loading branch information
bjorn3 committed Apr 20, 2019
1 parent d4e7b08 commit 3af60e0
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 2 deletions.
8 changes: 7 additions & 1 deletion src/librustc_codegen_ssa/back/archive.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,13 @@ pub trait ArchiveBuilder<'a> {
fn remove_file(&mut self, name: &str);
fn src_files(&mut self) -> Vec<String>;

fn add_rlib(&mut self, path: &Path, name: &str, lto: bool, skip_objects: bool) -> io::Result<()>;
fn add_rlib(
&mut self,
path: &Path,
name: &str,
lto: bool,
skip_objects: bool,
) -> io::Result<()>;
fn add_native_library(&mut self, name: &str);
fn update_symbols(&mut self);

Expand Down
9 changes: 8 additions & 1 deletion src/librustc_codegen_ssa/back/link.rs
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,14 @@ fn link_binary_output<'a, B: ArchiveBuilder<'a>>(sess: &'a Session,
link_staticlib::<B>(sess, codegen_results, &out_filename, &tmpdir);
}
_ => {
link_natively::<B>(sess, crate_type, &out_filename, codegen_results, tmpdir.path(), target_cpu);
link_natively::<B>(
sess,
crate_type,
&out_filename,
codegen_results,
tmpdir.path(),
target_cpu,
);
}
}
out_filenames.push(out_filename);
Expand Down

0 comments on commit 3af60e0

Please sign in to comment.