From 0fbd09609f4b94d8f69a0db0e91c754402aba10f Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Thu, 27 Feb 2020 01:01:10 +0200 Subject: Clang-cl cross fix from Dale Curtis. Closes #5639. --- mesonbuild/backend/ninjabackend.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'mesonbuild/backend/ninjabackend.py') 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): -- cgit v1.1