Skip to content

Commit

Permalink
Include the dep itself in extra_paths for Windows
Browse files Browse the repository at this point in the history
This is needed in the case where a custom_target directly depends on a
shared library, and somehow loads it.

(Specifically this can be the case with gtkdoc, when it invokes
gtkdoc-scangobj, which will build and run it's own code to load a shared
library, to introspect it)
  • Loading branch information
jon-turney authored and nirbheek committed Jun 13, 2020
1 parent 1b7855c commit b91355a
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions mesonbuild/backend/backends.py
Original file line number Diff line number Diff line change
Expand Up @@ -743,6 +743,7 @@ def determine_windows_extra_paths(self, target: T.Union[build.BuildTarget, str],
for deppath in self.rpaths_for_bundled_shared_libraries(target, exclude_system=False):
result.add(os.path.normpath(os.path.join(self.environment.get_build_dir(), deppath)))
for bdep in extra_bdeps:
prospectives.add(bdep)
prospectives.update(bdep.get_transitive_link_deps())
# Internal deps
for ld in prospectives:
Expand Down

0 comments on commit b91355a

Please sign in to comment.