Skip to content

Commit 806031d

Browse files
larskanishsbt
authored andcommitted
Windows: Remove workaround for LLVM windres
It was introduced as part of the Arm64-on-Windows patch: ruby#8995 But a few days later it was fixed on the LLVM side for llvm-18 and backported to MSYS2: msys2/MINGW-packages#19157 (comment) Now this code is only unnecessary complexity.
1 parent 4a21b83 commit 806031d

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

configure.ac

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,6 @@ AS_CASE(["$target_os"],
546546
])
547547
rb_cv_binary_elf=no
548548
: ${enable_shared=yes}
549-
AS_IF([$WINDRES --version | grep LLVM > /dev/null], [USE_LLVM_WINDRES=yes], [USE_LLVM_WINDRES=no])
550549
],
551550
[hiuxmpp*], [AC_DEFINE(__HIUX_MPP__)]) # by TOYODA Eizi <[email protected]>
552551

@@ -4414,7 +4413,6 @@ AC_SUBST(MINIOBJS)
44144413
AC_SUBST(THREAD_MODEL)
44154414
AC_SUBST(COROUTINE_TYPE, ${coroutine_type})
44164415
AC_SUBST(PLATFORM_DIR)
4417-
AC_SUBST(USE_LLVM_WINDRES)
44184416

44194417
firstmf=`echo $FIRSTMAKEFILE | sed 's/:.*//'`
44204418
firsttmpl=`echo $FIRSTMAKEFILE | sed 's/.*://'`

cygwin/GNUmakefile.in

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,9 @@ MUNICODE_FLAG := $(if $(filter mingw%,$(target_os)),-municode)
66
override EXE_LDFLAGS += $(MUNICODE_FLAG)
77

88
DLLWRAP = @DLLWRAP@ --target=$(target_os) --driver-name="$(CC)"
9-
ifeq (@USE_LLVM_WINDRES@,yes) # USE_LLVM_WINDRES
10-
# llvm-windres fails when preprocessor options are added
11-
windres-cpp :=
12-
else
13-
windres-cpp := $(CPP) -xc
14-
windres-cpp := --preprocessor=$(firstword $(windres-cpp)) \
15-
$(addprefix --preprocessor-arg=,$(wordlist 2,$(words $(windres-cpp)),$(windres-cpp)))
16-
endif
9+
windres-cpp := $(CPP) -xc
10+
windres-cpp := --preprocessor=$(firstword $(windres-cpp)) \
11+
$(addprefix --preprocessor-arg=,$(wordlist 2,$(words $(windres-cpp)),$(windres-cpp)))
1712
WINDRES = @WINDRES@ $(windres-cpp) -DRC_INVOKED
1813
STRIP = @STRIP@
1914

0 commit comments

Comments
 (0)