diff options
| author | bors <bors@rust-lang.org> | 2022-03-03 04:28:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-03-03 04:28:08 +0000 |
| commit | 2f8d1a835b4e7feaf625f74d0d5cb9b84dbc845a (patch) | |
| tree | 58c9e240fbbb366d99880f74d49ab390c79285fb /compiler/rustc_codegen_ssa/src | |
| parent | 8769f4ef2fe1efddd1f072485f97f568e7328f79 (diff) | |
| parent | 878a4ff90e5987027f8ce3d350faaad02e0c83c9 (diff) | |
| download | rust-2f8d1a835b4e7feaf625f74d0d5cb9b84dbc845a.tar.gz rust-2f8d1a835b4e7feaf625f74d0d5cb9b84dbc845a.zip | |
Auto merge of #94541 - Dylan-DPC:rollup-564wbq3, r=Dylan-DPC
Rollup of 9 pull requests Successful merges: - #92061 (update char signess for openbsd) - #93072 (Compatible variants suggestion with desugaring) - #93354 (Add documentation about `BorrowedFd::to_owned`.) - #93663 (Rename `BorrowedFd::borrow_raw_fd` to `BorrowedFd::borrow_raw`.) - #94375 (Adt copy suggestions) - #94433 (Improve allowness of the unexpected_cfgs lint) - #94499 (Documentation was missed when demoting Windows XP to no_std only) - #94505 (Restore the local filter on mono item sorting) - #94529 (Unused doc comments blocks) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/link.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs index 9e252c0d9b7..9cc06ac0319 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -1,4 +1,5 @@ use rustc_arena::TypedArena; +use rustc_ast::CRATE_NODE_ID; use rustc_data_structures::fx::{FxHashSet, FxIndexMap}; use rustc_data_structures::memmap::Mmap; use rustc_data_structures::temp_dir::MaybeTempDir; @@ -2434,7 +2435,7 @@ fn add_upstream_native_libraries( fn relevant_lib(sess: &Session, lib: &NativeLib) -> bool { match lib.cfg { - Some(ref cfg) => rustc_attr::cfg_matches(cfg, &sess.parse_sess, None), + Some(ref cfg) => rustc_attr::cfg_matches(cfg, &sess.parse_sess, CRATE_NODE_ID, None), None => true, } } |