diff options
author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-06-12 20:55:19 +0530 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-06-12 20:55:19 +0530 |
commit | d23e6b34c77f1e6bee8ab475ab05e3f5250949e7 (patch) | |
tree | 795ccedcfe7195cf70990381ba23495574a2fda6 /mesonbuild/compilers.py | |
parent | f792641b34a83d61a421f0d76a8c72a956bdb073 (diff) | |
download | meson-d23e6b34c77f1e6bee8ab475ab05e3f5250949e7.zip meson-d23e6b34c77f1e6bee8ab475ab05e3f5250949e7.tar.gz meson-d23e6b34c77f1e6bee8ab475ab05e3f5250949e7.tar.bz2 |
Preserve -L -l pairings fetched from external deps
While adding link args for external deps, sometimes different
libraries come from different prefixes, and an older version of the
same library might be present in other prefixes and we don't want to
accidentally pick that up.
For example:
/usr/local/lib/libglib-2.0.so
/usr/local/lib/pkgconfig/glib-2.0.pc
/usr/local/lib/libz.so
/usr/local/lib/pkgconfig/zlib.pc
/home/mesonuser/.local/lib/libglib-2.0.so
/home/mesonuser/.local/lib/pkgconfig/glib-2.0.pc
PKG_CONFIG_PATH="/home/mesonuser/.local/lib/pkgconfig/:/usr/local/lib/pkgconfig/"
If a target uses `dependencies : [glib_dep, zlib_dep]`, it will end up
using /usr/local/lib/libglib-2.0.so instead of
/home/mesonuser/.local/lib/libglib-2.0.so despite using the pkg-config
file in /home/mesonuser/.local/lib/pkgconfig because we reorder the -L
flag and separate it from the -l flag.
With this change, external link arguments will be added to the
compiler list without de-dup or reordering.
Closes https://github.com/mesonbuild/meson/issues/1718
Diffstat (limited to 'mesonbuild/compilers.py')
-rw-r--r-- | mesonbuild/compilers.py | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py index 80d12a0..2b54cc8 100644 --- a/mesonbuild/compilers.py +++ b/mesonbuild/compilers.py @@ -465,6 +465,19 @@ class CompilerArgs(list): self.insert(i + 1, '-Wl,--end-group') return self.compiler.unix_args_to_native(self) + def append_direct(self, arg): + ''' + Append the specified argument without any reordering or de-dup + ''' + super().append(arg) + + def extend_direct(self, iterable): + ''' + Extend using the elements in the specified iterable without any + reordering or de-dup + ''' + super().extend(iterable) + def __add__(self, args): new = CompilerArgs(self, self.compiler) new += args |