diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-02-27 01:01:10 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-02-27 23:50:03 +0200 |
| commit | 0fbd09609f4b94d8f69a0db0e91c754402aba10f (patch) | |
| tree | 46847895ddb890dfbb577d85755a74a38fe38b7a | |
| parent | 852fa087db6105c7c1a52251d0f3ae8fdd9f1ce0 (diff) | |
| download | meson-0fbd09609f4b94d8f69a0db0e91c754402aba10f.zip meson-0fbd09609f4b94d8f69a0db0e91c754402aba10f.tar.gz meson-0fbd09609f4b94d8f69a0db0e91c754402aba10f.tar.bz2 | |
Clang-cl cross fix from Dale Curtis. Closes #5639.
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 5f5de0a..24c91f3 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -269,7 +269,9 @@ int dummy; # 'Note: including file: d:\MyDir\include\stdio.h', however # different locales have different messages with a different # number of colons. Match up to the the drive name 'd:\'. - matchre = re.compile(rb"^(.*\s)[a-zA-Z]:\\.*stdio.h$") + # When used in cross compilation, the path separator is a + # backslash rather than a forward slash so handle both. + matchre = re.compile(rb"^(.*\s)([a-zA-Z]:\\|\/).*stdio.h$") def detect_prefix(out): for line in re.split(rb'\r?\n', out): |