Skip to content

Commit 2b8a284

Browse files
committed
bootstrap: Don't bundle musl on Unikraft
Signed-off-by: Martin Kröning <[email protected]>
1 parent 71ad558 commit 2b8a284

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/bootstrap/compile.rs

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

src/bootstrap/sanity.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ than building it.
206206
}
207207

208208
// Make sure musl-root is valid
209-
if target.contains("musl") {
209+
if target.contains("musl") && !target.contains("unikraft") {
210210
// If this is a native target (host is also musl) and no musl-root is given,
211211
// fall back to the system toolchain in /usr before giving up
212212
if build.musl_root(*target).is_none() && build.config.build == *target {

0 commit comments

Comments
 (0)