diff options
| author | bors <bors@rust-lang.org> | 2024-11-30 14:34:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-11-30 14:34:27 +0000 |
| commit | e93e096cc88728337fb41ff74431ebe71a1b4663 (patch) | |
| tree | 1c68490f853f25cc8bd7228ef92c384dbe774dc9 /src/bootstrap | |
| parent | e48ddd8a0bbd1769587017f04c518d686ea3b206 (diff) | |
| parent | 6512836be0a8650d11fb440534f54b60baf35eb7 (diff) | |
| download | rust-e93e096cc88728337fb41ff74431ebe71a1b4663.tar.gz rust-e93e096cc88728337fb41ff74431ebe71a1b4663.zip | |
Auto merge of #133658 - jieyouxu:rollup-rq7e0gk, r=jieyouxu
Rollup of 10 pull requests Successful merges: - #116161 (Stabilize `extended_varargs_abi_support`) - #132750 ([AIX] handle libunwind native_libs) - #133488 (tests: Add regression test for self referential structs with cow as last field) - #133569 (Bump `ruzstd` to 0.7.3) - #133585 (Do not call `extern_crate` on current trait on crate mismatch errors) - #133587 (Fix target_feature handling in freg of LoongArch inline assembly) - #133599 (Add `+forced-atomics` feature to esp32s2 no_std target) - #133620 (Simplify hir_typeck_pass_to_variadic_function) - #133623 (Improve span handling in `parse_expr_bottom`.) - #133625 (custom MIR: add doc comment for debuginfo) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/src/core/build_steps/compile.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs index cc6eb1ec4a9..0cacd6e4f37 100644 --- a/src/bootstrap/src/core/build_steps/compile.rs +++ b/src/bootstrap/src/core/build_steps/compile.rs @@ -330,7 +330,7 @@ fn copy_third_party_objects( if target == "x86_64-fortanix-unknown-sgx" || builder.config.llvm_libunwind(target) == LlvmLibunwind::InTree - && (target.contains("linux") || target.contains("fuchsia")) + && (target.contains("linux") || target.contains("fuchsia") || target.contains("aix")) { let libunwind_path = copy_llvm_libunwind(builder, target, &builder.sysroot_target_libdir(*compiler, target)); |