Skip to content

Commit 1f47a28

Browse files
k-takatabrammool
authored andcommitted
patch 8.2.4271: MS-Windows: cannot build with Ruby 3.1.0
Problem: MS-Windows: cannot build with Ruby 3.1.0. Solution: Adjust the DLL name and include directory. (Ken Takata, closes vim#9666)
1 parent 672776d commit 1f47a28

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

src/Make_cyg_ming.mak

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,8 @@ RUBY_PLATFORM = i586-mswin32
466466
RUBY_PLATFORM = i386-mingw32
467467
else ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/x64-mingw32),)
468468
RUBY_PLATFORM = x64-mingw32
469+
else ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/x64-mingw-ucrt),)
470+
RUBY_PLATFORM = x64-mingw-ucrt
469471
else
470472
RUBY_PLATFORM = i386-mswin32
471473
endif
@@ -479,7 +481,9 @@ RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_API_VER)
479481
# Base name of msvcrXX.dll which is used by ruby's dll.
480482
RUBY_MSVCRT_NAME = msvcrt
481483
endif
482-
ifeq ($(ARCH),x86-64)
484+
ifeq ($(RUBY_PLATFORM),x64-mingw-ucrt)
485+
RUBY_INSTALL_NAME = x64-ucrt-ruby$(RUBY_API_VER)
486+
else ifeq ($(ARCH),x86-64)
483487
RUBY_INSTALL_NAME = x64-$(RUBY_MSVCRT_NAME)-ruby$(RUBY_API_VER)
484488
else
485489
RUBY_INSTALL_NAME = $(RUBY_MSVCRT_NAME)-ruby$(RUBY_API_VER)

src/Make_mvc.mak

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1186,7 +1186,11 @@ RUBY_MSVCRT_NAME = $(MSVCRT_NAME)
11861186
! if "$(CPU)" == "i386"
11871187
RUBY_INSTALL_NAME = $(RUBY_MSVCRT_NAME)-ruby$(RUBY_API_VER)
11881188
! else # CPU
1189+
! if EXIST($(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/x64-mingw-ucrt)
1190+
RUBY_INSTALL_NAME = x64-ucrt-ruby$(RUBY_API_VER)
1191+
! else
11891192
RUBY_INSTALL_NAME = x64-$(RUBY_MSVCRT_NAME)-ruby$(RUBY_API_VER)
1193+
! endif
11901194
! endif # CPU
11911195
! endif # RUBY_INSTALL_NAME
11921196

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -750,6 +750,8 @@ static char *(features[]) =
750750

751751
static int included_patches[] =
752752
{ /* Add new patch number below this line */
753+
/**/
754+
4271,
753755
/**/
754756
4270,
755757
/**/

0 commit comments

Comments
 (0)