Commit 5148ef2
committed
windows: Fix absolute-header.m4 for newer msys2 appearing as cygwin.
MSYS2 is trying to move closer to cygwin and as part of that effort
they changed reporting of the system triplets from msys to cygwin:
https://www.msys2.org/news/#2025-06-20-replacing-x86_64-pc-msys-with-x86_64-pc-cygwin
This broke our builds in AppVeyor, since detection of absolute paths
for system headers is now using the wrong path separator list:
checking absolute name of <stdio.h>... ""
checking absolute name of <string.h>... ""
Fix by adding cygwin to the list for Windows-style paths. With that,
we can properly detect the headers again:
checking absolute name of <stdio.h>...
"C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\ucrt\\stdio.h"
checking absolute name of <string.h>...
"C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\ucrt\\string.h"
We used the 'Previous' variant of the image for AppVeyor before to
avoid this issue, but now even the previous image has the new MSYS2
and CI is fully broken without the fix.
Acked-by: Mike Pattrick <[email protected]>
Acked-by: Kevin Traynor <[email protected]>
Acked-by: Eelco Chaudron <[email protected]>
Signed-off-by: Ilya Maximets <[email protected]>1 parent 5fdcc45 commit 5148ef2
2 files changed
+2
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
| 2 | + | |
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
68 | 68 | | |
69 | 69 | | |
70 | 70 | | |
71 | | - | |
| 71 | + | |
72 | 72 | | |
73 | 73 | | |
74 | 74 | | |
| |||
0 commit comments