diff options
| author | bors <bors@rust-lang.org> | 2024-10-12 05:42:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-10-12 05:42:23 +0000 |
| commit | 763ad520cc6b831ec98e20f8a8fe85b160ad859d (patch) | |
| tree | 30c855c33c3ce962a0f2e166a32ff088b0225c83 /compiler/rustc_codegen_ssa/src/back/link.rs | |
| parent | 6a3b69c6b0529151da5fb4568961519a80adccf9 (diff) | |
| parent | 1439844faaa86a593c5e20fe22dd72f1332b1dbc (diff) | |
| download | rust-763ad520cc6b831ec98e20f8a8fe85b160ad859d.tar.gz rust-763ad520cc6b831ec98e20f8a8fe85b160ad859d.zip | |
Auto merge of #131423 - cuviper:beta-next, r=cuviper
[beta] backports - Only add an automatic SONAME for Rust dylibs #130960 - Reject leading unsafe in `cfg!(...)` and `--check-cfg` #131057, resolving https://github.com/rust-lang/rust/issues/131055 - Disable jump threading `UnOp::Not` for non-bool #131201 - Update LLVM submodule #131448 - Split x86_64-msvc-ext into two jobs #130072 - Use a small runner for msvc-ext2 job #130151 r? ghost
Diffstat (limited to 'compiler/rustc_codegen_ssa/src/back/link.rs')
| -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 e8143b9a5f3..1518e45f16f 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -2493,7 +2493,7 @@ fn add_order_independent_options( } } - cmd.set_output_kind(link_output_kind, out_filename); + cmd.set_output_kind(link_output_kind, crate_type, out_filename); add_relro_args(cmd, sess); |