aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Sales de Andrade <quantum.analyst@gmail.com>2017-06-19 19:07:09 -0400
committerNirbheek Chauhan <nirbheek@centricular.com>2017-07-17 14:08:50 +0530
commitcf01adbf77a5a739fb7be6a1f297d16c3213da94 (patch)
treedeb69086d4cf38fa48ecd403e43b9824eb421831
parenta07fd0cb7cab97bf3edb55e5e721397188c94e66 (diff)
downloadmeson-cf01adbf77a5a739fb7be6a1f297d16c3213da94.zip
meson-cf01adbf77a5a739fb7be6a1f297d16c3213da94.tar.gz
meson-cf01adbf77a5a739fb7be6a1f297d16c3213da94.tar.bz2
Add all internal dep rpaths to gnome module builds.
Running gtkdoc on a shared library that depends on another shared library would fail otherwise.
-rw-r--r--mesonbuild/modules/gnome.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index 00e5a8c..7d539aa 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@@ -303,6 +303,8 @@ class GnomeModule(ExtensionModule):
for d in state.backend.determine_rpath_dirs(lib):
d = os.path.join(state.environment.get_build_dir(), d)
link_command.append('-L' + d)
+ if include_rpath:
+ link_command.append('-Wl,-rpath,' + d)
if include_rpath:
link_command.append('-Wl,-rpath,' + libdir)
if depends: