diff options
| author | Lars Kanis <lars.kanis@sincnovation.com> | 2024-12-18 15:13:18 +0100 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2026-01-15 11:14:54 +0900 |
| commit | 806031d2ce9cb26e146ce47f6811ca038f1ffe27 (patch) | |
| tree | 3b1caf44540faa29e964b0187c5b0a08730a1054 | |
| parent | 4a21b83693fdc0e976da209047ba286b2f4084e5 (diff) | |
Windows: Remove workaround for LLVM windres
It was introduced as part of the Arm64-on-Windows patch:
https://github.com/ruby/ruby/pull/8995
But a few days later it was fixed on the LLVM side for llvm-18 and backported to MSYS2:
https://github.com/msys2/MINGW-packages/pull/19157#issuecomment-1825285063
Now this code is only unnecessary complexity.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | cygwin/GNUmakefile.in | 11 |
2 files changed, 3 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 90326e2926..4e7367804d 100644 --- a/configure.ac +++ b/configure.ac @@ -546,7 +546,6 @@ AS_CASE(["$target_os"], ]) rb_cv_binary_elf=no : ${enable_shared=yes} - AS_IF([$WINDRES --version | grep LLVM > /dev/null], [USE_LLVM_WINDRES=yes], [USE_LLVM_WINDRES=no]) ], [hiuxmpp*], [AC_DEFINE(__HIUX_MPP__)]) # by TOYODA Eizi <toyoda@npd.kishou.go.jp> @@ -4414,7 +4413,6 @@ AC_SUBST(MINIOBJS) AC_SUBST(THREAD_MODEL) AC_SUBST(COROUTINE_TYPE, ${coroutine_type}) AC_SUBST(PLATFORM_DIR) -AC_SUBST(USE_LLVM_WINDRES) firstmf=`echo $FIRSTMAKEFILE | sed 's/:.*//'` firsttmpl=`echo $FIRSTMAKEFILE | sed 's/.*://'` diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in index 8e83d73040..109baa747d 100644 --- a/cygwin/GNUmakefile.in +++ b/cygwin/GNUmakefile.in @@ -6,14 +6,9 @@ MUNICODE_FLAG := $(if $(filter mingw%,$(target_os)),-municode) override EXE_LDFLAGS += $(MUNICODE_FLAG) DLLWRAP = @DLLWRAP@ --target=$(target_os) --driver-name="$(CC)" -ifeq (@USE_LLVM_WINDRES@,yes) # USE_LLVM_WINDRES - # llvm-windres fails when preprocessor options are added - windres-cpp := -else - windres-cpp := $(CPP) -xc - windres-cpp := --preprocessor=$(firstword $(windres-cpp)) \ - $(addprefix --preprocessor-arg=,$(wordlist 2,$(words $(windres-cpp)),$(windres-cpp))) -endif +windres-cpp := $(CPP) -xc +windres-cpp := --preprocessor=$(firstword $(windres-cpp)) \ + $(addprefix --preprocessor-arg=,$(wordlist 2,$(words $(windres-cpp)),$(windres-cpp))) WINDRES = @WINDRES@ $(windres-cpp) -DRC_INVOKED STRIP = @STRIP@ |