Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

backends: Use a set while gathering RPATHs

This commit is contained in:
Nirbheek Chauhan 2018-05-23 18:52:25 +05:30 committed by Nirbheek Chauhan
parent 9f616e98bf
commit 165da6fb65
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mesonbuild/backend/backends.py
View File

@ -355,17 +355,13 @@ class Backend:
def determine_rpath_dirs(self, target): def determine_rpath_dirs(self, target):
link_deps = target.get_all_link_deps() link_deps = target.get_all_link_deps()
result = [] result = set()
for ld in link_deps: for ld in link_deps:
if ld is target: if ld is target:
continue continue
prospective = self.get_target_dir(ld) result.add(self.get_target_dir(ld))
if prospective not in result: result.update(self.rpaths_for_bundled_shared_libraries(target))
result.append(prospective) return list(result)
for rp in self.rpaths_for_bundled_shared_libraries(target):
if rp not in result:
result += [rp]
return result
def object_filename_from_source(self, target, source): def object_filename_from_source(self, target, source):
assert isinstance(source, mesonlib.File) assert isinstance(source, mesonlib.File)