commit a20be06f97d45efabaa52ef107eb7959c0c623a2
author Bram Moolenaar <Bram@vim.org> Fri Nov 11 21:24:18 2022 +0000
committer Bram Moolenaar <Bram@vim.org> Fri Nov 11 21:24:18 2022 +0000
tree 9de32fe29f5da028f73dcd6cdd54ac1a1349dcea
parent fd3084b6e298477dec4979515c6b4a8a3c3beeb2

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)

src/Make_cyg_ming.mak

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 37dc260..ad48a4d 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -227,7 +227,11 @@
 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.

src/version.c

diff --git a/src/version.c b/src/version.c
index fe55c0a..0e991a3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    860,
+/**/
     859,
 /**/
     858,