Skip to content

Commit 2ade671

Browse files
committed
[AIX] handle libunwind native_libs
AIX should follow a similar path here to other libunwind platforms, with regards to system vs in-tree libunwind and the native lib search directories
1 parent fe43131 commit 2ade671

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

compiler/rustc_metadata/src/native_libs.rs

+1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ pub fn walk_native_lib_search_dirs<R>(
5757
if sess.target.vendor == "fortanix"
5858
|| sess.target.os == "linux"
5959
|| sess.target.os == "fuchsia"
60+
|| sess.target.is_like_aix
6061
|| sess.target.is_like_osx && !sess.opts.unstable_opts.sanitizer.is_empty()
6162
{
6263
f(&sess.target_tlib_path.dir, false)?;

src/bootstrap/src/core/build_steps/compile.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ fn copy_third_party_objects(
330330

331331
if target == "x86_64-fortanix-unknown-sgx"
332332
|| builder.config.llvm_libunwind(target) == LlvmLibunwind::InTree
333-
&& (target.contains("linux") || target.contains("fuchsia"))
333+
&& (target.contains("linux") || target.contains("fuchsia") || target.contains("aix"))
334334
{
335335
let libunwind_path =
336336
copy_llvm_libunwind(builder, target, &builder.sysroot_target_libdir(*compiler, target));

0 commit comments

Comments
 (0)