diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-11-11 21:24:18 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-11-11 21:24:18 +0000 |
| commit | a20be06f97d45efabaa52ef107eb7959c0c623a2 (patch) | |
| tree | 9de32fe29f5da028f73dcd6cdd54ac1a1349dcea | |
| parent | fd3084b6e298477dec4979515c6b4a8a3c3beeb2 (diff) | |
patch 9.0.0860: MS-Windows: windres fails with clang 15.0.4v9.0.0860
Problem: MS-Windows: windres fails with clang 15.0.4.
Solution: Use llvm-windres. (John Marriott)
| -rw-r--r-- | src/Make_cyg_ming.mak | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index 37dc26033d..ad48a4d122 100644 --- 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 fe55c0a1ab..0e991a3ff8 100644 --- 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, |