]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #104091 - BelovDV:issue-103044, r=petrochenkov
authorbors <bors@rust-lang.org>
Tue, 15 Nov 2022 00:38:08 +0000 (00:38 +0000)
committerbors <bors@rust-lang.org>
Tue, 15 Nov 2022 00:38:08 +0000 (00:38 +0000)
Wrap bundled static libraries into object files

Fixes #103044 (not sure, couldn't test locally)

Bundled static libraries should be wrapped into object files as it's done for metadata file.

r? `@petrochenkov`

1  2 
compiler/rustc_codegen_ssa/src/back/link.rs

index 2bd9023395dbdde765922bce927f3e353ba6826c,8fbcbe45d6ee9c1f8be65c1d9a004c85a8d2205a..4445e5f6c3a64e3d24c0d9379f15cfd74337eda1
@@@ -6,9 -6,9 +6,9 @@@ use rustc_data_structures::memmap::Mmap
  use rustc_data_structures::temp_dir::MaybeTempDir;
  use rustc_errors::{ErrorGuaranteed, Handler};
  use rustc_fs_util::fix_windows_verbatim_for_gcc;
 -use rustc_hir::def_id::CrateNum;
 +use rustc_hir::def_id::{CrateNum, LOCAL_CRATE};
  use rustc_metadata::find_native_static_library;
- use rustc_metadata::fs::{emit_metadata, METADATA_FILENAME};
+ use rustc_metadata::fs::{emit_wrapper_file, METADATA_FILENAME};
  use rustc_middle::middle::dependency_format::Linkage;
  use rustc_middle::middle::exported_symbols::SymbolExportKind;
  use rustc_session::config::{self, CFGuard, CrateType, DebugInfo, LdImpl, Lto, Strip};