File tree Expand file tree Collapse file tree 3 files changed +11
-1
lines changed Expand file tree Collapse file tree 3 files changed +11
-1
lines changed Original file line number Diff line number Diff line change @@ -466,6 +466,8 @@ RUBY_PLATFORM = i586-mswin32
466
466
RUBY_PLATFORM = i386-mingw32
467
467
else ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/x64-mingw32),)
468
468
RUBY_PLATFORM = x64-mingw32
469
+ else ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/x64-mingw-ucrt),)
470
+ RUBY_PLATFORM = x64-mingw-ucrt
469
471
else
470
472
RUBY_PLATFORM = i386-mswin32
471
473
endif
@@ -479,7 +481,9 @@ RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_API_VER)
479
481
# Base name of msvcrXX.dll which is used by ruby's dll.
480
482
RUBY_MSVCRT_NAME = msvcrt
481
483
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)
483
487
RUBY_INSTALL_NAME = x64-$(RUBY_MSVCRT_NAME ) -ruby$(RUBY_API_VER )
484
488
else
485
489
RUBY_INSTALL_NAME = $(RUBY_MSVCRT_NAME ) -ruby$(RUBY_API_VER )
Original file line number Diff line number Diff line change @@ -1186,7 +1186,11 @@ RUBY_MSVCRT_NAME = $(MSVCRT_NAME)
1186
1186
! if "$(CPU)" == "i386"
1187
1187
RUBY_INSTALL_NAME = $(RUBY_MSVCRT_NAME ) -ruby$(RUBY_API_VER )
1188
1188
! 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
1189
1192
RUBY_INSTALL_NAME = x64-$(RUBY_MSVCRT_NAME ) -ruby$(RUBY_API_VER )
1193
+ ! endif
1190
1194
! endif # CPU
1191
1195
! endif # RUBY_INSTALL_NAME
1192
1196
Original file line number Diff line number Diff line change @@ -750,6 +750,8 @@ static char *(features[]) =
750
750
751
751
static int included_patches [] =
752
752
{ /* Add new patch number below this line */
753
+ /**/
754
+ 4271 ,
753
755
/**/
754
756
4270 ,
755
757
/**/
You can’t perform that action at this time.
0 commit comments