patch 9.0.0860: MS-Windows: windres fails with clang 15.0.4

Problem:    MS-Windows: windres fails with clang 15.0.4.
Solution:   Use llvm-windres. (John Marriott)

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 37dc26033d21c11ddd30ac6f1853f5484da3a4cb..ad48a4d12227d77b43fc7e13ce510bd0af529bfc 100644 (file)
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -227,7 +227,11 @@ endif
 ifeq ($(UNDER_CYGWIN),yes)
 WINDRES := $(CROSS_COMPILE)windres
 else
+ifeq ($(findstring clang,$(CC)),)
 WINDRES := windres
+else
+WINDRES := llvm-windres
+endif
 endif
 
 # Get the default ARCH.

diff --git a/src/version.c b/src/version.c
index fe55c0a1abd19b1f4dacac2eb0b804282e2bf5d3..0e991a3ff848e3b41e06431beadfb2c91ba484a1 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    860,
 /**/
     859,
 /**/