Skip to content

Add automatic sysroot injection into build environment flags #263

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

Open
PierreFerruSonos wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add automatic sysroot injection into build environment flags #263

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46aa465
Inject sysroot into build environment flags
PierreFerruSonos Jun 19, 2026
47ca1af
Use hashmap's entry function to simplify code
PierreFerruSonos Jun 19, 2026
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
29 changes: 21 additions & 8 deletions dinghy-lib/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,27 @@ impl PlatformConfiguration {
}

pub fn env(&self) -> Vec<(String, String)> {
self.env
.as_ref()
.map(|it| {
it.iter()
.map(|(key, value)| (key.to_string(), value.to_string()))
.collect_vec()
})
.unwrap_or(vec![])
let Some(env) = self.env.as_ref() else {
return vec![];
};

if let Some(sysroot) = self.sysroot.as_ref() {
let mut env = env.clone();
for flag in ["CFLAGS", "CPPFLAGS", "CXXFLAGS", "LDFLAGS"] {
let sr_argument = format!("--sysroot={sysroot}");
env.entry(flag.to_string())
.and_modify(|value| {
value.push(' ');
value.push_str(&sr_argument);
})
.or_insert(sr_argument);
}
env.into_iter().collect_vec()
} else {
env.iter()
.map(|(key, value)| (key.to_string(), value.to_string()))
.collect()
}
}
}

Expand Down