diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2020-05-04 12:02:12 -0700 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-05-07 00:01:33 +0300 |
| commit | 247eecc8fc61822e10ccbef54641fd326484a80a (patch) | |
| tree | cc1b3328aa86f42da5226427673adbd0c603ff62 | |
| parent | 4ea7c6ee123b3a86a40d0b67c25562aa2405524a (diff) | |
| download | meson-247eecc8fc61822e10ccbef54641fd326484a80a.zip meson-247eecc8fc61822e10ccbef54641fd326484a80a.tar.gz meson-247eecc8fc61822e10ccbef54641fd326484a80a.tar.bz2 | |
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
| -rw-r--r-- | mesonbuild/envconfig.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py index 25b3c7f..a4af39a 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) |