aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2016-04-18 22:50:37 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2016-04-18 22:51:24 +0530
commited774a68c647eb00b8e531a8370161fb6696230b (patch)
tree2a28415d522967be01f0ff0b3be44bc1996aff34
parent86aa51232ee73343d6f0aa136e925aa196be55f3 (diff)
downloadmeson-ed774a68c647eb00b8e531a8370161fb6696230b.zip
meson-ed774a68c647eb00b8e531a8370161fb6696230b.tar.gz
meson-ed774a68c647eb00b8e531a8370161fb6696230b.tar.bz2
scripts/meson_exe: prepend extra_paths to PATH instead of appending
This way locally-built DLLs and EXEs are preferred over system-wide ones
-rw-r--r--mesonbuild/scripts/meson_exe.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/scripts/meson_exe.py b/mesonbuild/scripts/meson_exe.py
index 2b91de8..f075fa0 100644
--- a/mesonbuild/scripts/meson_exe.py
+++ b/mesonbuild/scripts/meson_exe.py
@@ -53,7 +53,7 @@ def run_exe(exe):
child_env = os.environ.copy()
child_env.update(exe.env)
if len(exe.extra_paths) > 0:
- child_env['PATH'] = child_env['PATH'] + ';'.join([''] + exe.extra_paths)
+ child_env['PATH'] = ';'.join(exe.extra_paths + ['']) + child_env['PATH']
p = subprocess.Popen(cmd + exe.cmd_args,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,