@@ -8,7 +8,7 @@ use rustc_errors::{ErrorGuaranteed, Handler};
8
8
use rustc_fs_util:: fix_windows_verbatim_for_gcc;
9
9
use rustc_hir:: def_id:: { CrateNum , LOCAL_CRATE } ;
10
10
use rustc_metadata:: find_native_static_library;
11
- use rustc_metadata:: fs:: { emit_wrapper_file , METADATA_FILENAME } ;
11
+ use rustc_metadata:: fs:: METADATA_FILENAME ;
12
12
use rustc_middle:: middle:: dependency_format:: Linkage ;
13
13
use rustc_middle:: middle:: exported_symbols:: SymbolExportKind ;
14
14
use rustc_session:: config:: { self , CFGuard , CrateType , DebugInfo , LdImpl , Lto , Strip } ;
@@ -293,7 +293,6 @@ fn link_rlib<'a>(
293
293
RlibFlavor :: Normal => {
294
294
let ( metadata, metadata_position) =
295
295
create_wrapper_file ( sess, b".rmeta" . to_vec ( ) , codegen_results. metadata . raw_data ( ) ) ;
296
- let metadata = emit_wrapper_file ( sess, & metadata, tmpdir, METADATA_FILENAME ) ;
297
296
match metadata_position {
298
297
MetadataPosition :: First => {
299
298
// Most of the time metadata in rlib files is wrapped in a "dummy" object
@@ -387,8 +386,8 @@ fn link_rlib<'a>(
387
386
let src = read ( lib_path)
388
387
. map_err ( |e| sess. emit_fatal ( errors:: ReadFileError { message : e } ) ) ?;
389
388
let ( data, _) = create_wrapper_file ( sess, b".bundled_lib" . to_vec ( ) , & src) ;
390
- let wrapper_file = emit_wrapper_file ( sess, & data, tmpdir, filename. as_str ( ) ) ;
391
- packed_bundled_libs. push ( wrapper_file ) ;
389
+ // let wrapper_file = emit_wrapper_file(sess, &data, tmpdir, filename.as_str());
390
+ packed_bundled_libs. push ( ( data , filename ) ) ;
392
391
continue ;
393
392
}
394
393
ab. add_archive ( & location, Box :: new ( |_| false ) ) . unwrap_or_else ( |error| {
@@ -446,7 +445,7 @@ fn link_rlib<'a>(
446
445
// Add all bundled static native library dependencies.
447
446
// Archives added to the end of .rlib archive, see comment above for the reason.
448
447
for lib in packed_bundled_libs {
449
- ab. add_file ( & lib)
448
+ ab. add_buffer ( lib. 0 , lib . 1 . as_str ( ) )
450
449
}
451
450
452
451
return Ok ( ab) ;
0 commit comments