diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-13 00:43:06 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-13 00:43:06 +0200 |
| commit | e1ecb95d1dcd70f2165d4005f48ee60bce9db279 (patch) | |
| tree | edf7fafc1a8f89a4d54950b53342d86fd082e3db | |
| parent | 85a0cd7635c45bb150b59f55dbd6ecbbe10048f8 (diff) | |
| parent | b6971f2007c0b28f12da2594498f51dadc70c963 (diff) | |
| download | meson-e1ecb95d1dcd70f2165d4005f48ee60bce9db279.zip meson-e1ecb95d1dcd70f2165d4005f48ee60bce9db279.tar.gz meson-e1ecb95d1dcd70f2165d4005f48ee60bce9db279.tar.bz2 | |
Merged generate_gir fix.
| -rw-r--r-- | mesonbuild/modules/gnome.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 9262104..faca857 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -407,7 +407,13 @@ class GnomeModule: # spurious dependencies) but building GStreamer fails if they # are not used here. cflags, ldflags, gi_includes = self._get_dependencies_flags(deps, state, depends) - scan_command += list(cflags) + list(ldflags) + scan_command += list(cflags) + # need to put our output directory first as we need to use the + # generated libraries instead of any possibly installed system/prefix + # ones. + if isinstance(girtarget, build.SharedLibrary): + scan_command += ["-L@PRIVATE_OUTDIR_ABS_%s@" % girtarget.get_id()] + scan_command += list(ldflags) for i in gi_includes: scan_command += ['--add-include-path=%s' % i] @@ -425,7 +431,6 @@ class GnomeModule: if isinstance(girtarget, build.Executable): scan_command += ['--program', girtarget] elif isinstance(girtarget, build.SharedLibrary): - scan_command += ["-L@PRIVATE_OUTDIR_ABS_%s@" % girtarget.get_id()] libname = girtarget.get_basename() scan_command += ['--library', libname] scankwargs = {'output' : girfile, |