diff options
| author | bors <bors@rust-lang.org> | 2023-04-10 01:57:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-10 01:57:51 +0000 |
| commit | 3c2e2dd5c516acc60ababd12e5dba684d71c2315 (patch) | |
| tree | 3c98cde9acdc4917072d59c1047155d6eaeea602 /compiler/rustc_codegen_ssa/src | |
| parent | 696aaad58c57a589f6fb2ecff5bae2eec581cb71 (diff) | |
| parent | dd5942d77c44bd0f6baac5c2dc3e6f73df82015d (diff) | |
| download | rust-3c2e2dd5c516acc60ababd12e5dba684d71c2315.tar.gz rust-3c2e2dd5c516acc60ababd12e5dba684d71c2315.zip | |
Auto merge of #110127 - matthiaskrgr:rollup-6ui12x5, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #108843 (Instantiate instead of erasing binder when probing param methods) - #109985 (Add little `is_test_crate` function) - #110028 (Migrate `rustc_hir_analysis` to session diagnostic [Part 3]) - #110095 (Migrate remainder of rustc_ty_utils to `SessionDiagnostic`) - #110108 (Add renaming of ignore-git to changelog) - #110114 (compiletest: Give a better error message if `node` isn't installed) 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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs index 6a0d0ca55c2..7a5fa5a370c 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -2301,7 +2301,7 @@ fn add_native_libs_from_crate( || (whole_archive == None && bundle && cnum == LOCAL_CRATE - && sess.opts.test); + && sess.is_test_crate()); if bundle && cnum != LOCAL_CRATE { if let Some(filename) = lib.filename { |