summaryrefslogtreecommitdiff
path: root/src/Make_cyg_ming.mak
diff options
context:
space:
mode:
authorK.Takata <kentkt@csc.jp>2022-01-31 13:25:36 +0000
committerBram Moolenaar <Bram@vim.org>2022-01-31 13:25:36 +0000
commit1f47a287ee4f8b1d007dff878b23dd0cd6104f38 (patch)
treedb05f9be13f756180abceafaeb9d26ae30a0d5f0 /src/Make_cyg_ming.mak
parent672776dbe8427876ef4bfce84520712df87b6eb1 (diff)
downloadvim-git-1f47a287ee4f8b1d007dff878b23dd0cd6104f38.tar.gz
patch 8.2.4271: MS-Windows: cannot build with Ruby 3.1.0v8.2.4271
Problem: MS-Windows: cannot build with Ruby 3.1.0. Solution: Adjust the DLL name and include directory. (Ken Takata, closes #9666)
Diffstat (limited to 'src/Make_cyg_ming.mak')
-rw-r--r--src/Make_cyg_ming.mak6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index ab71b26f1..585539d48 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -466,6 +466,8 @@ RUBY_PLATFORM = i586-mswin32
RUBY_PLATFORM = i386-mingw32
else ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/x64-mingw32),)
RUBY_PLATFORM = x64-mingw32
+ else ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/x64-mingw-ucrt),)
+RUBY_PLATFORM = x64-mingw-ucrt
else
RUBY_PLATFORM = i386-mswin32
endif
@@ -479,7 +481,9 @@ RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_API_VER)
# Base name of msvcrXX.dll which is used by ruby's dll.
RUBY_MSVCRT_NAME = msvcrt
endif
- ifeq ($(ARCH),x86-64)
+ ifeq ($(RUBY_PLATFORM),x64-mingw-ucrt)
+RUBY_INSTALL_NAME = x64-ucrt-ruby$(RUBY_API_VER)
+ else ifeq ($(ARCH),x86-64)
RUBY_INSTALL_NAME = x64-$(RUBY_MSVCRT_NAME)-ruby$(RUBY_API_VER)
else
RUBY_INSTALL_NAME = $(RUBY_MSVCRT_NAME)-ruby$(RUBY_API_VER)