aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Sales de Andrade <quantum.analyst@gmail.com>2017-06-19 19:05:42 -0400
committerNirbheek Chauhan <nirbheek@centricular.com>2017-07-17 13:53:54 +0530
commit7c8ba60384f9c6b9bdcad0345f56d73c246ab98c (patch)
treef9cc7d9fec0036a7c0cfb719d150ef99d499e952
parentadd7aa841f1ad1026860c532b9ae73199746781c (diff)
downloadmeson-7c8ba60384f9c6b9bdcad0345f56d73c246ab98c.zip
meson-7c8ba60384f9c6b9bdcad0345f56d73c246ab98c.tar.gz
meson-7c8ba60384f9c6b9bdcad0345f56d73c246ab98c.tar.bz2
Use absolute path to target dir within gnome module.
Stuff like gtkdoc may not be run in the top-level build directory, so these paths need to be absolute. Fixes #1950.
-rw-r--r--mesonbuild/modules/gnome.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index 6ec7040..3c80a09 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@@ -294,7 +294,7 @@ class GnomeModule(ExtensionModule):
else:
link_command = ['-l' + lib.name]
if isinstance(lib, build.SharedLibrary):
- libdir = state.backend.get_target_dir(lib)
+ libdir = os.path.join(state.environment.get_build_dir(), state.backend.get_target_dir(lib))
link_command.append('-L' + libdir)
# Needed for the following binutils bug:
# https://github.com/mesonbuild/meson/issues/1911