From a2a979cf4336e04dd05fe4ca0dcf5fa8425d474f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= Date: Mon, 5 Nov 2018 15:35:16 -0500 Subject: gnome: Use full path for static libraries Makes it a bit safer. --- mesonbuild/modules/gnome.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'mesonbuild') diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index ae86146..e520d22 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -540,7 +540,12 @@ class GnomeModule(ExtensionModule): if isinstance(girtarget, build.Executable): ret += ['--program', girtarget] else: - libname = girtarget.get_basename() + # Because of https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/72 + # we can't use the full path until this is merged. + if isinstance(girtarget, build.SharedLibrary): + libname = girtarget.get_basename() + else: + libname = os.path.join("@PRIVATE_OUTDIR_ABS_%s@" % girtarget.get_id(), girtarget.get_filename()) # Needed for the following binutils bug: # https://github.com/mesonbuild/meson/issues/1911 # However, g-ir-scanner does not understand -Wl,-rpath -- cgit v1.1