bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Exclude llvm-libunwind from the self-contained set on s390x-musl targets.

Browse source 
llvm-libunwind does not support s390x targets at present, so we cannot build it
for s390x targets.  Accordingly, remove it from the self-contained set.
This commit is contained in:
Ariadne Conill 2022-01-15 21:33:07 +00:00
parent ec4bcaac45
commit 1a37262bf9
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/bootstrap/compile.rs
View file

@ -227,8 +227,10 @@ fn copy_self_contained_objects(
target_deps.push((target, DependencyType::TargetSelfContained)); target_deps.push((target, DependencyType::TargetSelfContained));
} }
let libunwind_path = copy_llvm_libunwind(builder, target, &libdir_self_contained); if !target.starts_with("s390x") {
target_deps.push((libunwind_path, DependencyType::TargetSelfContained)); let libunwind_path = copy_llvm_libunwind(builder, target, &libdir_self_contained);
target_deps.push((libunwind_path, DependencyType::TargetSelfContained));
}
} else if target.ends_with("-wasi") { } else if target.ends_with("-wasi") {
let srcdir = builder let srcdir = builder
.wasi_root(target) .wasi_root(target)