Skip to content

Commit 7b10f48

Browse files
klokikeli-schwartz
authored andcommitted
De-duplicate BuildTarget.sources
If the same source is provided by multiple dependencies it was added multiple times, as `added_sources` was only guarding against duplicates within the same source list. This was not a problem with ninja, but it triggers multiple sanity checks within xcode backend while attempting to create multiple ids for the same file. Rename `added_sources` to `seen_sources` as per reviewers request
1 parent 3ba0976 commit 7b10f48

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

‎mesonbuild/build.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -762,6 +762,8 @@ def __init__(
762762
self.pch: T.Dict[str, T.List[str]] = {}
763763
self.extra_args: T.DefaultDict[str, T.List[str]] = kwargs.get('language_args', defaultdict(list))
764764
self.sources: T.List[File] = []
765+
# If the same source is defined multiple times, use it only once.
766+
self.seen_sources: T.Set[File] = set()
765767
self.generated: T.List['GeneratedTypes'] = []
766768
self.extra_files: T.List[File] = []
767769
self.d_features: DFeatures = {
@@ -884,12 +886,11 @@ def process_sourcelist(self, sources: T.List['SourceOutputs']) -> None:
884886
(static as they are only regenerated if meson itself is regenerated)
885887
3. Sources files generated by another target or a Generator (generated)
886888
"""
887-
added_sources: T.Set[File] = set() # If the same source is defined multiple times, use it only once.
888889
for s in sources:
889890
if isinstance(s, File):
890-
if s not in added_sources:
891+
if s not in self.seen_sources:
891892
self.sources.append(s)
892-
added_sources.add(s)
893+
self.seen_sources.add(s)
893894
elif isinstance(s, (CustomTarget, CustomTargetIndex, GeneratedList)):
894895
self.generated.append(s)
895896

0 commit comments

Comments
 (0)