diff options
| author | Olivier CrĂȘte <olivier.crete@collabora.com> | 2018-11-05 15:35:16 -0500 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2018-11-05 21:33:07 -0500 |
| commit | a2a979cf4336e04dd05fe4ca0dcf5fa8425d474f (patch) | |
| tree | 6d3baf206fa40eb1e37ee5f7f600318bb86b875b /mesonbuild | |
| parent | 9da0c6af9884371b7e685d8ff5af1c9c2f4208c6 (diff) | |
| download | meson-a2a979cf4336e04dd05fe4ca0dcf5fa8425d474f.zip meson-a2a979cf4336e04dd05fe4ca0dcf5fa8425d474f.tar.gz meson-a2a979cf4336e04dd05fe4ca0dcf5fa8425d474f.tar.bz2 | |
gnome: Use full path for static libraries
Makes it a bit safer.
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/modules/gnome.py | 7 |
1 files changed, 6 insertions, 1 deletions
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 |