From 9ee0de427ca9f7876ee3bdbc338c1a4f40a7b0d7 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Fri, 11 Mar 2022 14:28:48 -0800 Subject: 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. --- mesonbuild/envconfig.py | 1 + 1 file changed, 1 insertion(+) 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', } -- cgit v1.1