aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/scripts
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2021-01-21 13:12:21 -0500
committerXavier Claessens <xclaesse@gmail.com>2021-01-27 09:00:54 -0500
commit633264984b4b2278491476a0997193ff4996b3a6 (patch)
tree3859bec183f89046511cb6d5aca75411cc0e1440 /mesonbuild/scripts
parente4137ae3eca0c73e8c19ea84d9a203ddb065f0d8 (diff)
downloadmeson-633264984b4b2278491476a0997193ff4996b3a6.zip
meson-633264984b4b2278491476a0997193ff4996b3a6.tar.gz
meson-633264984b4b2278491476a0997193ff4996b3a6.tar.bz2
custom_target: Add env kwarg
Diffstat (limited to 'mesonbuild/scripts')
-rw-r--r--mesonbuild/scripts/meson_exe.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/scripts/meson_exe.py b/mesonbuild/scripts/meson_exe.py
index 50ad2f5..751d39b 100644
--- a/mesonbuild/scripts/meson_exe.py
+++ b/mesonbuild/scripts/meson_exe.py
@@ -39,7 +39,8 @@ def run_exe(exe: ExecutableSerialisation) -> int:
else:
cmd_args = exe.cmd_args
child_env = os.environ.copy()
- child_env.update(exe.env)
+ if exe.env:
+ child_env = exe.env.get_env(child_env)
if exe.extra_paths:
child_env['PATH'] = (os.pathsep.join(exe.extra_paths + ['']) +
child_env['PATH'])