diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2022-03-11 14:28:48 -0800 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2022-03-22 15:15:29 +0200 |
| commit | 9ee0de427ca9f7876ee3bdbc338c1a4f40a7b0d7 (patch) | |
| tree | 2e0a39e1edf24d06ac68324ed0caedfd2574b522 | |
| parent | d3e3733c1a7e36777879ad73f4779c248346d960 (diff) | |
| download | meson-9ee0de427ca9f7876ee3bdbc338c1a4f40a7b0d7.zip meson-9ee0de427ca9f7876ee3bdbc338c1a4f40a7b0d7.tar.gz meson-9ee0de427ca9f7876ee3bdbc338c1a4f40a7b0d7.tar.bz2 | |
envconfig: use $PKG_CONFIG for pkg-config find_program as well as pkgconfig
It looks like internally we use pkgconfig, even though the installed
name is pkg-config. This fixes `tests cases/common/44 pkgconfig-gen`,
which will ignore PKG_CONFIG and select the wrong pkg-config binary if
you have $PKG_CONFIG set.
| -rw-r--r-- | mesonbuild/envconfig.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py index 0723675..a49e7dd 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py @@ -120,6 +120,7 @@ ENV_VAR_PROG_MAP: T.Mapping[str, str] = { 'cmake': 'CMAKE', 'qmake': 'QMAKE', 'pkgconfig': 'PKG_CONFIG', + 'pkg-config': 'PKG_CONFIG', 'make': 'MAKE', 'vapigen': 'VAPIGEN', } |