File tree Expand file tree Collapse file tree 1 file changed +11
-7
lines changed Expand file tree Collapse file tree 1 file changed +11
-7
lines changed Original file line number Diff line number Diff line change @@ -1132,19 +1132,23 @@ def get_lib_ignore_components():
1132
1132
1133
1133
def find_lib_deps (components_map , elf_config , link_args , ignore_components = None ):
1134
1134
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" ])
1141
1145
1142
1146
implicit_lib_deps = link_args .get ("__LIB_DEPS" , [])
1143
1147
for component in components_map .values ():
1144
1148
component_config = component ["config" ]
1145
1149
if (
1146
1150
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
1148
1152
):
1149
1153
continue
1150
1154
if (
You can’t perform that action at this time.
0 commit comments