Skip to content

Commit

Permalink
patch 9.0.0860: MS-Windows: windres fails with clang 15.0.4
Browse files Browse the repository at this point in the history
Problem:    MS-Windows: windres fails with clang 15.0.4.
Solution:   Use llvm-windres. (John Marriott)
  • Loading branch information
brammool committed Nov 11, 2022
1 parent fd3084b commit a20be06
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/Make_cyg_ming.mak
Expand Up @@ -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

This comment has been minimized.

Copy link
@k-takata

k-takata Nov 14, 2022

Member

I think we can use else ifeq to reduce the nest:

--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -226,13 +226,11 @@ CXX := $(CROSS_COMPILE)g++
 endif
 ifeq ($(UNDER_CYGWIN),yes)
 WINDRES := $(CROSS_COMPILE)windres
-else
-ifeq ($(findstring clang,$(CC)),)
+else ifeq ($(findstring clang,$(CC)),)
 WINDRES := windres
 else
 WINDRES := llvm-windres
 endif
-endif
 
 # Get the default ARCH.
 ifndef ARCH

This comment has been minimized.

Copy link
@brammool

brammool via email Nov 14, 2022

Author Contributor

This comment has been minimized.

Copy link
@k-takata

k-takata Nov 14, 2022

Member

Okay, I created #11547.


# Get the default ARCH.
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -695,6 +695,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
860,
/**/
859,
/**/
Expand Down

0 comments on commit a20be06

Please sign in to comment.