ruby-changes:74115
From: nagachika <ko1@a...>
Date: Tue, 18 Oct 2022 22:28:01 +0900 (JST)
Subject: [ruby-changes:74115] 671811a89d (ruby_3_1): merge revision(s) d8f81ffdff668b457339885c15d7cee785ad38be:
https://git.ruby-lang.org/ruby.git/commit/?id=671811a89d From 671811a89d6e9f71c7c06117e6800cda219e0e85 Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Tue, 18 Oct 2022 22:27:38 +0900 Subject: merge revision(s) d8f81ffdff668b457339885c15d7cee785ad38be: builtin.c includes mini_builtin.c when cross-compiling --- common.mk | 3 +++ 1 file changed, 3 insertions(+) --- common.mk | 3 +++ version.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/common.mk b/common.mk index 16a388a674..6f414bb26d 100644 --- a/common.mk +++ b/common.mk @@ -1693,6 +1693,9 @@ help: PHONY https://github.com/ruby/ruby/blob/trunk/common.mk#L1693 " https://bugs.ruby-lang.org/projects/ruby/wiki/DeveloperHowto" \ $(MESSAGE_END) +$(CROSS_COMPILING:yes=)builtin.$(OBJEXT): {$(VPATH)}mini_builtin.c +$(CROSS_COMPILING:yes=)builtin.$(OBJEXT): {$(VPATH)}miniprelude.c + # AUTOGENERATED DEPENDENCIES START addr2line.$(OBJEXT): {$(VPATH)}addr2line.c addr2line.$(OBJEXT): {$(VPATH)}addr2line.h diff --git a/version.h b/version.h index 46df323e54..fdb8826890 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 110 +#define RUBY_PATCHLEVEL 111 #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/