Skip to content

Commit 5148ef2

Browse files
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

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
version: 1.0.{build}
2-
image: Previous Visual Studio 2019
2+
image: Visual Studio 2019
33
branches:
44
only:
55
- main

m4/absolute-header.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ AC_DEFUN([gl_ABSOLUTE_HEADER_ONE],
6868
esac
6969
changequote(,)
7070
case "$host_os" in
71-
(mingw*|msys*)
71+
(mingw*|msys*|cygwin*)
7272
dnl For the sake of native Windows compilers (excluding gcc),
7373
dnl treat backslash as a directory separator, like /.
7474
dnl Actually, these compilers use a double-backslash as

0 commit comments

Comments
 (0)