Mercurial > vim

changeset 31051:01aa48ecb9e7 v9.0.0860

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.0860: MS-Windows: windres fails with clang 15.0.4 Commit: https://github.com/vim/vim/commit/a20be06f97d45efabaa52ef107eb7959c0c623a2 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Nov 11 21:24:18 2022 +0000 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)
author Bram Moolenaar <Bram@vim.org>
date Fri, 11 Nov 2022 22:30:04 +0100
parents 00bee28a0c00
children 2187b5ee2e89
files src/Make_cyg_ming.mak src/version.c
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    860,
+/**/
     859,
 /**/
     858,