MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-28 07:44:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-deps-recursive' into 'master'

Browse Source 
Make dev deps recursive

See merge request redox-os/redox!1745
This commit is contained in:
Jeremy Soller 2025-12-07 07:22:50 -07:00
commit 3371ea31ba
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/cook/cook_build.rs
View File

@ -188,12 +188,13 @@ pub fn build(
let mut dep_pkgars = BTreeSet::new();
let mut dep_host_pkgars = BTreeSet::new();
let mut build_deps =
CookRecipe::get_build_deps_recursive(&recipe.build.dependencies, false, false)
.map_err(|e| format!("{:?}", e))?;
for dep in &recipe.build.dev_dependencies {
build_deps.push(CookRecipe::from_name(dep.clone()).map_err(|e| format!("{:?}", e))?);
}
let build_deps = [
&recipe.build.dependencies[..],
&recipe.build.dev_dependencies[..],
]
.concat();
let build_deps = CookRecipe::get_build_deps_recursive(&build_deps, false, false)
.map_err(|e| format!("{:?}", e))?;
for dependency in build_deps.iter() {
let (_, pkgar, _) = dependency.stage_paths();
if dependency.name.is_host() {