Skip to content

Commit 82f30fc

Browse files
authored
Refactor find_lib_deps to use a set for ignores (more reliable)
1 parent a8cb3fd commit 82f30fc

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

builder/frameworks/espidf.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1132,19 +1132,23 @@ def get_lib_ignore_components():
11321132

11331133
def find_lib_deps(components_map, elf_config, link_args, ignore_components=None):
11341134
ignore_components = ignore_components or []
1135-
result = [
1136-
components_map[d["id"]]["lib"]
1137-
for d in elf_config.get("dependencies", [])
1138-
if components_map.get(d["id"], {})
1139-
and not d["id"].startswith(tuple(ignore_components))
1140-
]
1135+
ignore_set = set(ignore_components)
1136+
result = []
1137+
for d in elf_config.get("dependencies", []):
1138+
comp = components_map.get(d["id"])
1139+
if not comp:
1140+
continue
1141+
comp_name = comp["config"]["name"]
1142+
if comp_name in ignore_set:
1143+
continue
1144+
result.append(comp["lib"])
11411145

11421146
implicit_lib_deps = link_args.get("__LIB_DEPS", [])
11431147
for component in components_map.values():
11441148
component_config = component["config"]
11451149
if (
11461150
component_config["type"] not in ("STATIC_LIBRARY", "OBJECT_LIBRARY")
1147-
or component_config["name"] in ignore_components
1151+
or component_config["name"] in ignore_set
11481152
):
11491153
continue
11501154
if (

0 commit comments

Comments
 (0)