diff options
| author | Elliott Sales de Andrade <quantum.analyst@gmail.com> | 2016-11-13 04:41:21 -0500 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-13 12:39:03 -0500 |
| commit | 155f163341dc9e3c3b8c707f404648c824fea47c (patch) | |
| tree | 08f48bd27b979308c13d7b542d8247db7a4292cd | |
| parent | 08c82fd17ca1c125d66bb013154348c9ad8d4535 (diff) | |
| download | meson-155f163341dc9e3c3b8c707f404648c824fea47c.zip meson-155f163341dc9e3c3b8c707f404648c824fea47c.tar.gz meson-155f163341dc9e3c3b8c707f404648c824fea47c.tar.bz2 | |
Use portable path separator in wrappers.
The semicolon only separates paths on Windows, but the wrapper is
sometimes used on other platforms.
| -rwxr-xr-x | mesonbuild/scripts/meson_exe.py | 3 | ||||
| -rwxr-xr-x | mesonbuild/scripts/meson_test.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mesonbuild/scripts/meson_exe.py b/mesonbuild/scripts/meson_exe.py index d2ae357..3ea3926 100755 --- a/mesonbuild/scripts/meson_exe.py +++ b/mesonbuild/scripts/meson_exe.py @@ -53,7 +53,8 @@ def run_exe(exe): child_env = os.environ.copy() child_env.update(exe.env) if len(exe.extra_paths) > 0: - child_env['PATH'] = ';'.join(exe.extra_paths + ['']) + child_env['PATH'] + child_env['PATH'] = (os.pathsep.join(exe.extra_paths + ['']) + + child_env['PATH']) p = subprocess.Popen(cmd + exe.cmd_args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, diff --git a/mesonbuild/scripts/meson_test.py b/mesonbuild/scripts/meson_test.py index 7d4d7e3..8034815 100755 --- a/mesonbuild/scripts/meson_test.py +++ b/mesonbuild/scripts/meson_test.py @@ -134,7 +134,8 @@ def run_single_test(wrap, test): child_env.update(test.env) if len(test.extra_paths) > 0: - child_env['PATH'] = child_env['PATH'] + ';'.join([''] + test.extra_paths) + child_env['PATH'] = (child_env['PATH'] + + os.pathsep.join([''] + test.extra_paths)) if is_windows(): setsid = None else: |