diff options
| author | Ariadne Conill <ariadne@dereferenced.org> | 2022-01-15 21:33:07 +0000 |
|---|---|---|
| committer | Ariadne Conill <ariadne@dereferenced.org> | 2022-01-15 21:33:07 +0000 |
| commit | 1a37262bf92bf9c6b8979e434d2f4792a76de437 (patch) | |
| tree | fc046768485f1cae759dfc0c0a4377bdb12af6f2 /src | |
| parent | ec4bcaac450279b029f3480b8b8f1b82ab36a5eb (diff) | |
| download | rust-1a37262bf92bf9c6b8979e434d2f4792a76de437.tar.gz rust-1a37262bf92bf9c6b8979e434d2f4792a76de437.zip | |
Exclude llvm-libunwind from the self-contained set on s390x-musl targets.
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/compile.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index 043b38ecece..e17de0ba49e 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -227,8 +227,10 @@ fn copy_self_contained_objects( target_deps.push((target, DependencyType::TargetSelfContained)); } - let libunwind_path = copy_llvm_libunwind(builder, target, &libdir_self_contained); - target_deps.push((libunwind_path, DependencyType::TargetSelfContained)); + if !target.starts_with("s390x") { + let libunwind_path = copy_llvm_libunwind(builder, target, &libdir_self_contained); + target_deps.push((libunwind_path, DependencyType::TargetSelfContained)); + } } else if target.ends_with("-wasi") { let srcdir = builder .wasi_root(target) |