diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-02-27 01:01:10 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-02-27 01:02:45 +0200 |
| commit | c7ca30cc20fdc8346d806b087b7fb283a7471a82 (patch) | |
| tree | 4d3cd2d7be899935b0733de0df7153dbc92a046c | |
| parent | 6ba034c37d8004a72d392f37f66e709c593d8983 (diff) | |
| download | meson-fixclagclcross.tar.gz | |
Clang-cl cross fix from Dale Curtis. Closes #5639.fixclagclcross
| -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 5f5de0ac6..24c91f349 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): |