Merge pull request #108 from reutermj/master

Amalgamate dependencies directly into deps
SanderMertens · Aug 19, 2024 · c835c54 · c835c54
2 parents 1aee31d + 9a23b4c
commit c835c54
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/project.c b/src/project.c
@@ -1369,6 +1369,10 @@ int16_t copy_amalgamated_from_dep(
         dep->generate_path = dst_path;
 
         ut_log_push("copy-amalgamate");
+
+        // when amalgamating dependencies, copy them directly into deps/
+        dep->amalgamate_path = NULL;
+
         ut_try( bake_driver__generate(amalg_driver, config, dep), NULL);
         ut_log_pop();