Skip to content

Commit b05be97

Browse files
authored
Rollup merge of #92946 - kaniini:chore/llvm-libunwind-s390x, r=Mark-Simulacrum
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.
2 parents 04b2073 + 1a37262 commit b05be97

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

Diff for: src/bootstrap/compile.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,10 @@ fn copy_self_contained_objects(
227227
target_deps.push((target, DependencyType::TargetSelfContained));
228228
}
229229

230-
let libunwind_path = copy_llvm_libunwind(builder, target, &libdir_self_contained);
231-
target_deps.push((libunwind_path, DependencyType::TargetSelfContained));
230+
if !target.starts_with("s390x") {
231+
let libunwind_path = copy_llvm_libunwind(builder, target, &libdir_self_contained);
232+
target_deps.push((libunwind_path, DependencyType::TargetSelfContained));
233+
}
232234
} else if target.ends_with("-wasi") {
233235
let srcdir = builder
234236
.wasi_root(target)

0 commit comments

Comments
 (0)