MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-24 13:54:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Filter static to only direct deps

Browse Source
This commit is contained in:
Wildan M 2025-11-07 17:20:26 +07:00
parent 233d159760
commit c3cb1f6a2f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cook/cook_build.rs
View File

@ -377,7 +377,7 @@ fn build_auto_deps(
recipe: &Recipe,
target_dir: &Path,
stage_dir: &PathBuf,
dep_pkgars: BTreeSet<(PackageName, PathBuf)>,
mut dep_pkgars: BTreeSet<(PackageName, PathBuf)>,
logger: &PtyOut,
) -> Result<BTreeSet<PackageName>, String> {
let auto_deps_path = target_dir.join("auto_deps.toml");
@ -393,6 +393,7 @@ fn build_auto_deps(
wrapper.packages
} else {
let mut dynamic_deps = auto_deps_from_dynamic_linking(stage_dir, &dep_pkgars, logger);
dep_pkgars.retain(|x| recipe.build.dependencies.contains(&x.0));
let (package_deps, static_deps) =
auto_deps_from_static_package_deps(&dep_pkgars, &dynamic_deps).unwrap_or_default();
dynamic_deps.extend(package_deps);

4
src/cook/pty.rs
View File

@ -20,9 +20,9 @@ macro_rules! log_to_pty {
($logger:expr, $($arg:tt)+) => {
if $logger.is_some() {
use std::io::Write;
let logfd = $logger.as_ref().unwrap().1.try_clone().unwrap();
let mut logfd = $logger.as_ref().unwrap().1.try_clone().unwrap();
let _ = logfd.write(format!($($arg)+).as_bytes());
let _ = logfd.write(b'\n');
let _ = logfd.write(&[b'\n']);
} else {
eprintln!($($arg)+);
}