bootstrap: Don't bundle musl on Unikraft

Signed-off-by: Martin Kröning <martin.kroening@eonerc.rwth-aachen.de>
This commit is contained in:
Martin Kröning 2023-07-05 17:01:01 +02:00
parent 71ad5587a1
commit 2b8a284d78
Failed to extract signature
2 changed files with 2 additions and 2 deletions

View File

@ -261,7 +261,7 @@ fn copy_self_contained_objects(
// to using gcc from a glibc-targeting toolchain for linking.
// To do that we have to distribute musl startup objects as a part of Rust toolchain
// and link with them manually in the self-contained mode.
if target.contains("musl") {
if target.contains("musl") && !target.contains("unikraft") {
let srcdir = builder.musl_libdir(target).unwrap_or_else(|| {
panic!("Target {:?} does not have a \"musl-libdir\" key", target.triple)
});

View File

@ -206,7 +206,7 @@ than building it.
}
// Make sure musl-root is valid
if target.contains("musl") {
if target.contains("musl") && !target.contains("unikraft") {
// If this is a native target (host is also musl) and no musl-root is given,
// fall back to the system toolchain in /usr before giving up
if build.musl_root(*target).is_none() && build.config.build == *target {