feat: allow custom build to have gcc deps (#599)

src/generate.rs

@@ -17,17 +17,15 @@ use itertools::Itertools;
 use rayon::prelude::*;
 use solvent::DepGraph;
 
-use crate::{model::Rule, utils::ContainingPath};
-
-use super::{
+use crate::{
     build::Build,
     data::{load, FileTreeState},
     download,
-    model::BlockAllow,
-    nested_env,
-    nested_env::{Env, EnvKey, IfMissing},
+    model::{BlockAllow, Rule},
+    nested_env::{self, Env, EnvKey, IfMissing},
     ninja::{NinjaBuildBuilder, NinjaRule, NinjaRuleBuilder},
-    utils, Context, ContextBag, Dependency, Module, Task, TaskError,
+    utils::{self, ContainingPath},
+    Context, ContextBag, Dependency, Module, Task, TaskError,
 };
 
 #[derive(Deserialize, Serialize, Debug)]
@@ -736,6 +734,7 @@ fn configure_build(
                 .name("BUILD")
                 .description(Cow::from("BUILD ${out}"))
                 .command(expanded)
+                .deps(build.gcc_deps.as_ref())
                 .build()
                 .unwrap()
                 .named();

src/model/module.rs

@@ -327,6 +327,7 @@ impl fmt::Display for Module {
 
 #[derive(Clone, PartialEq, Eq, Debug, Serialize, Deserialize)]
 pub struct CustomBuild {
+    pub gcc_deps: Option<String>,
     pub cmd: Vec<String>,
     pub out: Option<Vec<String>>,
 }

src/model/rule.rs

@@ -61,7 +61,7 @@ impl PartialEq for Rule {
     }
 }
 
-use crate::ninja::{NinjaRule, NinjaRuleBuilder, NinjaRuleDeps};
+use crate::ninja::{NinjaRule, NinjaRuleBuilder};
 
 use super::VarExportSpec;
 
@@ -77,10 +77,7 @@ impl<'a> From<&'a Rule> for crate::ninja::NinjaRuleBuilder<'a> {
             .pool(rule.pool.as_deref().map(Cow::from))
             .always(rule.always)
             .export(&rule.export)
-            .deps(match &rule.gcc_deps {
-                None => NinjaRuleDeps::None,
-                Some(s) => NinjaRuleDeps::GCC(s.into()),
-            });
+            .deps(rule.gcc_deps.as_ref());
 
         builder
     }

src/ninja/mod.rs

@@ -19,6 +19,19 @@ pub enum NinjaRuleDeps {
     GCC(String),
 }
 
+impl<T> From<Option<T>> for NinjaRuleDeps
+where
+    T: AsRef<str>,
+{
+    fn from(value: Option<T>) -> Self {
+        if let Some(s) = value {
+            Self::GCC(String::from(s.as_ref()))
+        } else {
+            Self::None
+        }
+    }
+}
+
 #[derive(Builder, Clone)]
 #[builder(setter(into))]
 pub struct NinjaRule<'a> {