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

test extra paths: add extra paths for all build targets

This commit is contained in:
Mathieu Duponchelle 2018-05-24 00:07:01 +02:00 committed by Nirbheek Chauhan
parent bd2cc39f26
commit b3feff3032
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mesonbuild/backend/backends.py
View File

@ -574,7 +574,7 @@ class Backend:
tests.''' tests.'''
result = [] result = []
prospectives = [] prospectives = []
if isinstance(target, build.Executable): if isinstance(target, build.BuildTarget):
prospectives = target.get_transitive_link_deps() prospectives = target.get_transitive_link_deps()
# External deps # External deps
for deppath in self.rpaths_for_bundled_shared_libraries(target): for deppath in self.rpaths_for_bundled_shared_libraries(target):
@ -625,7 +625,7 @@ class Backend:
for a in t.cmd_args: for a in t.cmd_args:
if hasattr(a, 'held_object'): if hasattr(a, 'held_object'):
a = a.held_object a = a.held_object
if isinstance(a, build.Executable): if isinstance(a, build.BuildTarget):
extra_paths += self.determine_windows_extra_paths(a, []) extra_paths += self.determine_windows_extra_paths(a, [])
if isinstance(a, mesonlib.File): if isinstance(a, mesonlib.File):
a = os.path.join(self.environment.get_build_dir(), a.rel_to_builddir(self.build_to_src)) a = os.path.join(self.environment.get_build_dir(), a.rel_to_builddir(self.build_to_src))