Merge branch 'fix-path-calculations-in-git-bash' into 'master'

Utils: only use msys2 paths from msys2 python

See merge request ita1024/waf!2217
This commit is contained in:
ita1024 2019-02-26 17:26:32 +00:00
commit 7aa608889d
1 changed files with 3 additions and 1 deletions

View File

@ -490,7 +490,9 @@ def split_path_msys(path):
if sys.platform == 'cygwin':
split_path = split_path_cygwin
elif is_win32:
if os.environ.get('MSYSTEM'):
# Consider this an MSYSTEM environment if $MSYSTEM is set and python
# reports is executable from a unix like path on a windows host.
if os.environ.get('MSYSTEM') and sys.executable.startswith('/'):
split_path = split_path_msys
else:
split_path = split_path_win32