# HG changeset patch # User Bram Moolenaar # Date 1668202204 -3600 # Node ID 01aa48ecb9e7a8477c15a42f50d4996659daf30b # Parent 00bee28a0c00a26401eb5d96cc482bf6d67f5c09 patch 9.0.0860: MS-Windows: windres fails with clang 15.0.4 Commit: https://github.com/vim/vim/commit/a20be06f97d45efabaa52ef107eb7959c0c623a2 Author: Bram Moolenaar 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) diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak --- 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 --- 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,