From 8308e0d39d2a2ba70cc0012d7b12ec2d462995c1 Mon Sep 17 00:00:00 2001 From: Ellen Marie Dash Date: Mon, 16 Dec 2024 12:25:56 -0500 Subject: [PATCH] made some progress with do_env_test() xwin/zigbuild checks --- cargo-dist/src/lib.rs | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/cargo-dist/src/lib.rs b/cargo-dist/src/lib.rs index 6d6184dc9..5481b9ac4 100644 --- a/cargo-dist/src/lib.rs +++ b/cargo-dist/src/lib.rs @@ -76,16 +76,24 @@ pub fn do_env_test(cfg: &Config) -> DistResult<()> { .iter() .chain(dist.global_build_steps.iter()) { - // TODO: Figure out where to get host, target from? - //let wrapper = tasks::build_wrapper_for_cross(host, target)?; - - /* - match wrapper { - Some(CargoBuildWrapper::Xwin) => { need_xwin = true; } - Some(CargoBuildWrapper::ZigBuild) => { need_zigbuild = true; } - None => {} + match step { + BuildStep::Cargo(step) => { + println!("step = {:#?}", step); + /* + let host = step.host; + let target = step.target_triple; + // TODO: Figure out where to get host, target from? + let wrapper = tasks::build_wrapper_for_cross(host, target)?; + + match wrapper { + Some(CargoBuildWrapper::Xwin) => { need_xwin = true; } + Some(CargoBuildWrapper::ZigBuild) => { need_zigbuild = true; } + None => {} + } + */ + } + _ => {} } - */ } // These are all of the tools we can check for.