From 247eecc8fc61822e10ccbef54641fd326484a80a Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 4 May 2020 12:02:12 -0700 Subject: envconfig: Always honor PKG_CONFIG_PATH The comment for this code is correct, but the code itself isn't. The way it's implemented in a cross compile we don't look at PKG_CONFIG_PATH at all. Fixes: #7062 --- mesonbuild/envconfig.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mesonbuild/envconfig.py') diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py index 25b3c7ffa..a4af39abc 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py @@ -121,7 +121,7 @@ def get_env_var_pair(for_machine: MachineChoice, # ones. ([var_name + '_FOR_BUILD'] if is_cross else [var_name]), # Always just the unprefixed host verions - ([] if is_cross else [var_name]), + [var_name] )[for_machine] for var in candidates: value = os.environ.get(var) -- cgit v1.2.3