aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/scripts
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2019-08-27 23:38:05 +0530
committerGitHub <noreply@github.com>2019-08-27 23:38:05 +0530
commit83c010a17aafe59f77f321982ea6790655b97075 (patch)
treebf7df8f862e44606d81201f3e1c44d100746807d /mesonbuild/scripts
parentfe645a0a9e2da230d2c500af1f5b2db5da1e364d (diff)
parent42c5e4fe2b21a8f70f62e0153d0098b3d186259f (diff)
downloadmeson-83c010a17aafe59f77f321982ea6790655b97075.zip
meson-83c010a17aafe59f77f321982ea6790655b97075.tar.gz
meson-83c010a17aafe59f77f321982ea6790655b97075.tar.bz2
Merge pull request #5756 from thiblahute/wine_shortpaths
wine: Try to get the short paths when generating WINEPATH
Diffstat (limited to 'mesonbuild/scripts')
-rw-r--r--mesonbuild/scripts/meson_exe.py12
1 files changed, 4 insertions, 8 deletions
diff --git a/mesonbuild/scripts/meson_exe.py b/mesonbuild/scripts/meson_exe.py
index 8b34448..a5acb22 100644
--- a/mesonbuild/scripts/meson_exe.py
+++ b/mesonbuild/scripts/meson_exe.py
@@ -52,14 +52,10 @@ def run_exe(exe):
child_env['PATH'] = (os.pathsep.join(exe.extra_paths + ['']) +
child_env['PATH'])
if exe.exe_runner and mesonlib.substring_is_in_list('wine', exe.exe_runner.get_command()):
- wine_paths = ['Z:' + p for p in exe.extra_paths]
- wine_path = ';'.join(wine_paths)
- # Don't accidentally end with an `;` because that will add the
- # current directory and might cause unexpected behaviour
- if 'WINEPATH' in child_env:
- child_env['WINEPATH'] = wine_path + ';' + child_env['WINEPATH']
- else:
- child_env['WINEPATH'] = wine_path
+ child_env['WINEPATH'] = mesonlib.get_wine_shortpath(
+ exe.exe_runner.get_command(),
+ ['Z:' + p for p in exe.extra_paths] + child_env.get('WINEPATH', '').split(';')
+ )
p = subprocess.Popen(cmd_args, env=child_env, cwd=exe.workdir,
close_fds=False,