diff options
| author | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2020-11-01 03:08:16 +0100 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-11-12 20:27:40 +0200 |
| commit | d2aac3d80984b51919ecc39e50d5cec32b264580 (patch) | |
| tree | 0600eb264cfbec50f4c4194baa2f0ba6cb3aa549 /mesonbuild | |
| parent | dffd66e0ff2d3c91003fc4c361382c473ed11cfa (diff) | |
| download | meson-d2aac3d80984b51919ecc39e50d5cec32b264580.zip meson-d2aac3d80984b51919ecc39e50d5cec32b264580.tar.gz meson-d2aac3d80984b51919ecc39e50d5cec32b264580.tar.bz2 | |
dependencies: Put pkgconfig options before operands
This fixes building with meson when the POSIX behavior of getopt is used, such as when GNU libc is used with POSIXLY_CORRECT=1 defined
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/dependencies/base.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index 3a5f5f8..87518e1 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -869,9 +869,13 @@ class PkgConfigDependency(ExternalDependency): def _set_libs(self): env = None - libcmd = [self.name, '--libs'] + libcmd = ['--libs'] + if self.static: libcmd.append('--static') + + libcmd.append(self.name) + # Force pkg-config to output -L fields even if they are system # paths so we can do manual searching with cc.find_library() later. env = os.environ.copy() |