mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not ICE for native_lib without name

Browse Source
This commit is contained in:
yukang 2023-03-17 07:59:08 +08:00
parent 511364e787
commit c22f154e3f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compiler/rustc_metadata/src/native_libs.rs
View File

@ -53,12 +53,13 @@ fn find_bundled_library(
sess: &Session, sess: &Session,
) -> Option<Symbol> { ) -> Option<Symbol> {
if let NativeLibKind::Static { bundle: Some(true) | None, whole_archive } = kind if let NativeLibKind::Static { bundle: Some(true) | None, whole_archive } = kind
&& let Some(name) = name
&& sess.crate_types().iter().any(|t| matches!(t, &CrateType::Rlib | CrateType::Staticlib)) && sess.crate_types().iter().any(|t| matches!(t, &CrateType::Rlib | CrateType::Staticlib))
&& (sess.opts.unstable_opts.packed_bundled_libs || has_cfg || whole_archive == Some(true)) && (sess.opts.unstable_opts.packed_bundled_libs || has_cfg || whole_archive == Some(true))
{ {
let verbatim = verbatim.unwrap_or(false); let verbatim = verbatim.unwrap_or(false);
let search_paths = &sess.target_filesearch(PathKind::Native).search_path_dirs(); let search_paths = &sess.target_filesearch(PathKind::Native).search_path_dirs();
return find_native_static_library(name.unwrap().as_str(), verbatim, search_paths, sess) return find_native_static_library(name.as_str(), verbatim, search_paths, sess)
.file_name() .file_name()
.and_then(|s| s.to_str()) .and_then(|s| s.to_str())
.map(Symbol::intern); .map(Symbol::intern);