Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add x86_64-unikraft-linux-musl target #113411

Merged
merged 5 commits into from
Jul 25, 2023
Merged

Add x86_64-unikraft-linux-musl target #113411

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bb77aa8
compiler: Add `x86_64-unikraft-linux-musl` target
mkroening Jul 6, 2023
71ad558
compiler: Add `*-unikraft-linux-musl` documentation
mkroening Jul 6, 2023
2b8a284
bootstrap: Don't bundle musl on Unikraft
mkroening Jul 5, 2023
7485e9c
`unix::init`: Handle `ENOSYS` from `poll` on Unikraft.
mkroening Jul 5, 2023
5538047
`unix::init`: Don't use `signal` on Unikraft.
mkroening Jul 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
bootstrap: Don't bundle musl on Unikraft 
Signed-off-by: Martin Kröning <martin.kroening@eonerc.rwth-aachen.de>
  • Loading branch information
@mkroening
mkroening committed Jul 24, 2023
commit 2b8a284d78b40da55733d56f3229274aaa6f9716
2 changes: 1 addition & 1 deletion src/bootstrap/compile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
});
Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap/sanity.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down