Skip to content

Commit

Permalink
Merge pull request #2149 from actonlang/protect-main-deps
Browse files Browse the repository at this point in the history
Fix transitive deps
  • Loading branch information
plajjan authored Feb 3, 2025
2 parents ea60d3b + 6d16e1a commit c4991fb
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions cli/src/acton.act
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,12 @@ actor BuildProject(process_cap, env, args, on_build_success: action(str) -> None
search_paths = []

all_deps = deps.get_deps_recursive(fcap, fs.cwd())
# Add transitive dependencies to write new build.zig(.zon)
build_config.dependencies.update(all_deps.pkg_deps.items())
build_config.zig_dependencies.update(all_deps.zig_deps.items())
# Add transitive dependencies to write new build.zig(.zon), but don't
# override existing ones, including local overrides
for dep_name, dep in all_deps.pkg_deps.items():
build_config.dependencies.setdefault(dep_name, dep)
for dep_name, dep in all_deps.zig_deps.items():
build_config.zig_dependencies.setdefault(dep_name, dep)
write_buildzig(file.FileCap(env.cap), build_config)

for dep_name, dep in all_deps.pkg_deps.items():
Expand Down

0 comments on commit c4991fb

Please sign in to comment.