ruby-changes:74116
From: nagachika <ko1@a...>
Date: Tue, 18 Oct 2022 22:51:40 +0900 (JST)
Subject: [ruby-changes:74116] 3e05dff67c (ruby_3_1): merge revision(s) 6a43245e6cda89eddd105f5a6e0182a7229657af:
https://git.ruby-lang.org/ruby.git/commit/?id=3e05dff67c From 3e05dff67cfa734eff18f0edf826ab2876b210b4 Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Tue, 18 Oct 2022 22:50:29 +0900 Subject: merge revision(s) 6a43245e6cda89eddd105f5a6e0182a7229657af: Use BOOTSTRAPRUBY_COMMAND instead of fake.rb directly --- common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- common.mk | 2 +- version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common.mk b/common.mk index 6f414bb26d..9bfdd74938 100644 --- a/common.mk +++ b/common.mk @@ -893,7 +893,7 @@ ENC_HEADERS = $(srcdir)/enc/jis/props.h https://github.com/ruby/ruby/blob/trunk/common.mk#L893 $(ENC_MK): $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \ $(srcdir)/enc/encinit.c.erb $(ENC_HEADERS) $(srcdir)/lib/mkmf.rb $(RBCONFIG) $(HAVE_BASERUBY)-fake $(ECHO) generating $@ - $(Q) $(BOOTSTRAPRUBY) -r./$(arch)-fake $(srcdir)/enc/make_encmake.rb \ + $(Q) $(BOOTSTRAPRUBY_COMMAND) $(srcdir)/enc/make_encmake.rb \ --builtin-encs="$(BUILTIN_ENCOBJS)" --builtin-transes="$(BUILTIN_TRANSOBJS)" --module$(ENCSTATIC) $(ENCS) $@ .PRECIOUS: $(MKFILES) diff --git a/version.h b/version.h index fdb8826890..ca50c205eb 100644 --- a/version.h +++ b/version.h @@ -11,7 +11,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L11 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 3 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 111 +#define RUBY_PATCHLEVEL 112 #define RUBY_RELEASE_YEAR 2022 #define RUBY_RELEASE_MONTH 10 -- cgit v1.2.3 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/