@@ -2,16 +2,15 @@ use std::fs::File;
22use std:: path:: { Path , PathBuf } ;
33
44use rustc_session:: Session ;
5- use rustc_codegen_ssa:: back:: archive:: { find_library , ArchiveBuilder } ;
6- use rustc_codegen_ssa :: METADATA_FILENAME ;
5+ use rustc_codegen_ssa:: back:: archive:: ArchiveBuilder ;
6+
77use rustc_data_structures:: temp_dir:: MaybeTempDir ;
88use rustc_middle:: middle:: cstore:: DllImport ;
9- use rustc_span :: symbol :: Symbol ;
9+
1010
1111struct ArchiveConfig < ' a > {
1212 sess : & ' a Session ,
1313 dst : PathBuf ,
14- lib_search_paths : Vec < PathBuf > ,
1514 use_native_ar : bool ,
1615 use_gnu_style_archive : bool ,
1716}
@@ -35,11 +34,9 @@ pub struct ArArchiveBuilder<'a> {
3534
3635impl < ' a > ArchiveBuilder < ' a > for ArArchiveBuilder < ' a > {
3736 fn new ( sess : & ' a Session , output : & Path , input : Option < & Path > ) -> Self {
38- use rustc_codegen_ssa:: back:: link:: archive_search_paths;
3937 let config = ArchiveConfig {
4038 sess,
4139 dst : output. to_path_buf ( ) ,
42- lib_search_paths : archive_search_paths ( sess) ,
4340 use_native_ar : false ,
4441 // FIXME test for linux and System V derivatives instead
4542 use_gnu_style_archive : sess. target . options . archive_format == "gnu" ,
@@ -94,47 +91,27 @@ impl<'a> ArchiveBuilder<'a> for ArArchiveBuilder<'a> {
9491 ) ) ;
9592 }
9693
97- fn add_native_library ( & mut self , name : Symbol , verbatim : bool ) {
98- let location = find_library ( name, verbatim, & self . config . lib_search_paths , self . config . sess ) ;
99- self . add_archive ( location. clone ( ) , |_| false )
100- . unwrap_or_else ( |e| {
101- panic ! (
102- "failed to add native library {}: {}" ,
103- location. to_string_lossy( ) ,
104- e
105- ) ;
106- } ) ;
107- }
108-
109- fn add_rlib (
110- & mut self ,
111- rlib : & Path ,
112- name : & str ,
113- lto : bool ,
114- skip_objects : bool ,
115- ) -> std:: io:: Result < ( ) > {
116- let obj_start = name. to_owned ( ) ;
117-
118- self . add_archive ( rlib. to_owned ( ) , move |fname : & str | {
119- // Ignore metadata files, no matter the name.
120- if fname == METADATA_FILENAME {
121- return true ;
122- }
123-
124- // Don't include Rust objects if LTO is enabled
125- if lto && fname. starts_with ( & obj_start) && fname. ends_with ( ".o" ) {
126- return true ;
127- }
94+ fn add_archive < F > ( & mut self , archive_path : & Path , mut skip : F ) -> std:: io:: Result < ( ) >
95+ where
96+ F : FnMut ( & str ) -> bool + ' static ,
97+ {
98+ let mut archive = ar:: Archive :: new ( std:: fs:: File :: open ( & archive_path) ?) ;
99+ let archive_index = self . src_archives . len ( ) ;
128100
129- // Otherwise if this is *not* a rust object and we're skipping
130- // objects then skip this file
131- if skip_objects && ( !fname. starts_with ( & obj_start) || !fname. ends_with ( ".o" ) ) {
132- return true ;
101+ let mut i = 0 ;
102+ while let Some ( entry) = archive. next_entry ( ) {
103+ let entry = entry?;
104+ let file_name = String :: from_utf8 ( entry. header ( ) . identifier ( ) . to_vec ( ) )
105+ . map_err ( |err| std:: io:: Error :: new ( std:: io:: ErrorKind :: InvalidData , err) ) ?;
106+ if !skip ( & file_name) {
107+ self . entries
108+ . push ( ( file_name, ArchiveEntry :: FromArchive { archive_index, entry_index : i } ) ) ;
133109 }
110+ i += 1 ;
111+ }
134112
135- // ok, don't skip this
136- return false ;
137- } )
113+ self . src_archives . push ( ( archive_path. to_owned ( ) , archive) ) ;
114+ Ok ( ( ) )
138115 }
139116
140117 fn update_symbols ( & mut self ) {
@@ -239,32 +216,3 @@ impl<'a> ArchiveBuilder<'a> for ArArchiveBuilder<'a> {
239216 unimplemented ! ( ) ;
240217 }
241218}
242-
243- impl < ' a > ArArchiveBuilder < ' a > {
244- fn add_archive < F > ( & mut self , archive_path : PathBuf , mut skip : F ) -> std:: io:: Result < ( ) >
245- where
246- F : FnMut ( & str ) -> bool + ' static ,
247- {
248- let mut archive = ar:: Archive :: new ( std:: fs:: File :: open ( & archive_path) ?) ;
249- let archive_index = self . src_archives . len ( ) ;
250-
251- let mut i = 0 ;
252- while let Some ( entry) = archive. next_entry ( ) {
253- let entry = entry. unwrap ( ) ;
254- let file_name = String :: from_utf8 ( entry. header ( ) . identifier ( ) . to_vec ( ) ) . unwrap ( ) ;
255- if !skip ( & file_name) {
256- self . entries . push ( (
257- file_name,
258- ArchiveEntry :: FromArchive {
259- archive_index,
260- entry_index : i,
261- } ,
262- ) ) ;
263- }
264- i += 1 ;
265- }
266-
267- self . src_archives . push ( ( archive_path, archive) ) ;
268- Ok ( ( ) )
269- }
270- }
0 commit comments