Skip to content

[pull] master from ruby:master #660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Jan 6, 2026
+9 −4
Merged

[pull] master from ruby:master #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ AC_ARG_WITH(baseruby,
AC_PATH_PROG([BASERUBY], [ruby], [false])
])
AS_IF([test "$HAVE_BASERUBY" != no], [
RUBYOPT=- $BASERUBY --disable=gems -rerb -rfileutils -rtempfile "${tooldir}/missing-baseruby.bat" || HAVE_BASERUBY=no
RUBYOPT=- $BASERUBY --disable=gems "${tooldir}/missing-baseruby.bat" --verbose || HAVE_BASERUBY=no
])
AS_IF([test "${HAVE_BASERUBY:=no}" != no], [
AS_CASE(["$build_os"], [mingw*], [
Expand Down
9 changes: 7 additions & 2 deletions tool/missing-baseruby.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,10 @@ call :warn "executable host ruby is required. use --with-baseruby option."
call :warn "Note that BASERUBY must be Ruby 3.1.0 or later."
call :abort
(goto :eof ^;)
abort unless defined?(RubyVM::InstructionSequence)
abort if RUBY_VERSION < s[%r"warn .*Ruby ([\d.]+)(?:\.0)?",1]
verbose = true if ARGV[0] == "--verbose"
case
when !defined?(RubyVM::InstructionSequence)
abort(*(["BASERUBY must be CRuby"] if verbose))
when RUBY_VERSION < s[%r[warn .*\KBASERUBY .*Ruby ([\d.]+)(?:\.0)?.*(?=\")],1]
abort(*(["#{$&}. Found: #{RUBY_VERSION}"] if verbose))
end
2 changes: 1 addition & 1 deletion win32/setup.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ prefix = $(prefix:\=/)
@type $(config_make) >>$(MAKEFILE)
@del $(config_make) > nul
!if "$(HAVE_BASERUBY)" != "no" && "$(BASERUBY)" != ""
$(BASERUBY:/=\) "$(srcdir)/tool/missing-baseruby.bat"
$(BASERUBY:/=\) "$(srcdir)/tool/missing-baseruby.bat" --verbose
!endif
!if "$(WITH_GMP)" != "no"
@($(CC) $(XINCFLAGS) <<conftest.c -link $(XLDFLAGS) gmp.lib > nul && (echo USE_GMP = yes) || exit /b 0) >>$(MAKEFILE)
Expand Down