diff options
| author | Ty <ty.balduf@schrodinger.com> | 2022-06-14 15:39:43 -0400 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2022-07-16 00:31:45 +0300 |
| commit | c7eb601e07f7840160a59555ada3980255e92f66 (patch) | |
| tree | f9b09aba964b170a6369d1730996713d25c81c67 | |
| parent | c19773c0bc6a980682034e89b079179f77e6e3d6 (diff) | |
| download | meson-c7eb601e07f7840160a59555ada3980255e92f66.tar.gz | |
Fix finding of Visual studio path in mingw64
Ninja backend will fail to find the vs dep dependency
prefix string in a mingw64 environment. This change
simply updates the regex to be able to capture mingw64's unique
file separation pattern.
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 06348b404..7f74b24c9 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -499,7 +499,7 @@ class NinjaBackend(backends.Backend): # use backslashes, but without the leading drive name, so # allow the path to start with any path separator, i.e. # \MyDir\include\stdio.h. - matchre = re.compile(rb"^(.*\s)([a-zA-Z]:\\|[\\\/]).*stdio.h$") + matchre = re.compile(rb"^(.*\s)([a-zA-Z]:[\\/]|[\\\/]).*stdio.h$") def detect_prefix(out): for line in re.split(rb'\r?\n', out): @@ -516,7 +516,7 @@ class NinjaBackend(backends.Backend): if result: return result - raise MesonException('Could not determine vs dep dependency prefix string.') + raise MesonException(f'Could not determine vs dep dependency prefix string. output: {stderr} {stdout}') def generate(self): ninja = environment.detect_ninja_command_and_version(log=True) |