Skip to content

feat: adapt to picolibc #27

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

Draft
andreiltd wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −10
Draft

feat: adapt to picolibc #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 21 additions & 10 deletions src/toolchain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,26 @@ pub fn prepare(args: &Args) -> Result<()> {
std::fs::create_dir_all(&include_dst_dir)
.context("Failed to create sysroot include directory")?;

const INCLUDE_DIRS: &[&str] = &[
"third_party/printf/",
"third_party/musl/include",
"third_party/musl/arch/generic",
"third_party/musl/arch/x86_64",
"third_party/musl/src/internal",
];

for dir in INCLUDE_DIRS {
// Detect which libc variant is present: picolibc or legacy musl
let include_dirs: &[&str] = if hyperlight_guest_bin_dir
.join("third_party/musl/include")
.is_dir()
{
&[
"third_party/printf/",
"third_party/musl/include",
"third_party/musl/arch/generic",
"third_party/musl/arch/x86_64",
"third_party/musl/src/internal",
]
} else {
&[
"third_party/picolibc/libc/include",
"third_party/picolibc/libc/stdio",
]
};

for dir in include_dirs {
let include_src_dir = hyperlight_guest_bin_dir.join(dir);
let files = glob::glob(&format!("{}/**/*.h", include_src_dir.display()))
.context("Failed to read include source directory")?;
Expand Down Expand Up @@ -94,7 +105,7 @@ pub fn cflags(args: &Args) -> OsString {
"-fstack-clash-protection",
"-mstack-probe-size=4096",
"-mno-red-zone",
"-nostdinc",
"-nostdlibinc",
// Define HYPERLIGHT as we use this to conditionally enable/disable code
// in the libc headers
"-DHYPERLIGHT=1",
Expand Down