diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2023-03-21 10:18:28 -0400 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.com> | 2023-03-21 10:29:26 -0400 |
| commit | 8eff173dc66eb6657e3ce490f5613a259194e4d7 (patch) | |
| tree | febbdcdaf8ee4f9f829bcfec589c96f64a399b02 | |
| parent | 90327fab338ee39a6100d136d146175d98a37f02 (diff) | |
| download | meson-xclaesse/pr11561-orig.zip meson-xclaesse/pr11561-orig.tar.gz meson-xclaesse/pr11561-orig.tar.bz2 | |
pkg-config: Allow system program if pkg_config_libdir is setxclaesse/pr11561-orig
| -rw-r--r-- | mesonbuild/dependencies/pkgconfig.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/pkgconfig.py b/mesonbuild/dependencies/pkgconfig.py index 2ef22e9..2acdbd7 100644 --- a/mesonbuild/dependencies/pkgconfig.py +++ b/mesonbuild/dependencies/pkgconfig.py @@ -99,9 +99,10 @@ class PkgConfigDependency(ExternalDependency): else: assert cls.class_pkgbin[for_machine] is None, 'for mypy' mlog.debug(f'Pkg-config binary for {for_machine} is not cached.') + has_libdir = bool(env.properties[for_machine].get_pkg_config_libdir()) for potential_pkgbin in find_external_program( env, for_machine, 'pkgconfig', 'Pkg-config', - env.default_pkgconfig, allow_default_for_cross=False): + env.default_pkgconfig, allow_default_for_cross=has_libdir): version_if_ok = cls.check_pkgconfig(env, potential_pkgbin) if not version_if_ok: continue |