bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Tidy

Browse source
This commit is contained in:
bjorn3 2019-03-30 16:16:25 +01:00
parent d4e7b083ce
commit 3af60e09a1
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/librustc_codegen_ssa/back/archive.rs
View file

@ -33,7 +33,13 @@ pub trait ArchiveBuilder<'a> {
fn remove_file(&mut self, name: &str); fn remove_file(&mut self, name: &str);
fn src_files(&mut self) -> Vec<String>; 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 add_native_library(&mut self, name: &str);
fn update_symbols(&mut self); fn update_symbols(&mut self);

9
src/librustc_codegen_ssa/back/link.rs
View file

@ -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_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); out_filenames.push(out_filename);