Skip to content

Commit

Permalink
remove extranously added dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Ubuntu committed Sep 12, 2022
1 parent 441ff30 commit ae584f6
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions ghdl.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -161,15 +161,16 @@ def _ghdl_units_impl(ctx):
for dep in ctx.attr.deps:
src_map.update(dep[GHDLFiles].src_map)
for src, settings in dep[GHDLFiles].src_map.items():
if lib_id != settings["lib_name"]:
if lib_id != settings["lib_name"] and settings["lib_name"] not in unit_lib_deps:
unit_lib_deps.append(settings["lib_name"])

for src in ctx.files.srcs:
src_map[src]={
"unit_lib_deps": unit_lib_deps,
"lib_name": lib_id,
"unit_settings": unit_settings,
"flags": ctx.attr.flags
"flags": ctx.attr.flags,
"file_deps": trans_srcs
}

return [
Expand Down Expand Up @@ -218,7 +219,6 @@ def get_elaboration_artifact(ctx, working_dir):
elaboration_artifact = ctx.actions.declare_file("{}/{}".format(working_dir, elaboration_artifact_name))
return elaboration_artifact_name, elaboration_artifact


def _ghdl_analysis(ctx, info, src, src_map, lib_cfg_map, compiled_output_files, compiled_srcs, srcs):
ghdl_tool = info.wrapper.files.to_list()[0]
docker = info.docker;
Expand Down Expand Up @@ -256,8 +256,14 @@ def _ghdl_analysis(ctx, info, src, src_map, lib_cfg_map, compiled_output_files,
sym_cf_files = create_lib_file_sym_links(ctx, lib, p_deps, "objs", src)

inputs = []
inputs.extend(work_dir_symlink_srcs)
inputs.extend(compiled_srcs)
w_src_names = {w: w.basename for w in work_dir_symlink_srcs}
names = [s.basename for s in src_map[src]["file_deps"].to_list()]
for w_src, name in w_src_names.items():
if name in names:
inputs.append(w_src)
for c_src in compiled_srcs:
if c_src in src_map[src]["file_deps"].to_list():
inputs.append(c_src)
inputs.append(sym_src)
if curr_lib_file:
inputs.append(curr_lib_file)
Expand Down

0 comments on commit ae584f6

Please sign in to comment.