summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@ruby-lang.org>2022-10-18 21:50:27 +0900
committernagachika <nagachika@ruby-lang.org>2022-10-18 21:50:27 +0900
commit75539c2d1ec42e938ebbcc70186a0c67c5b48753 (patch)
tree8f343ab32c7dd8d881b672343d1bfc3676ed0bd3
parent5f8c65494985f1afaf0f8d0e4dbb06acbd87da53 (diff)
merge revision(s) 85a483169f8381bec08ff2c9a9fc66167fc8a84a:
Use cross compiling settings as fake.rb for snapshots --- tool/make-snapshot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
-rwxr-xr-xtool/make-snapshot2
-rw-r--r--version.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/tool/make-snapshot b/tool/make-snapshot
index b04af6a4d2..d2044970da 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -436,7 +436,7 @@ def package(vcs, rev, destdir, tmp = nil)
# use fallback file
end
clean.create("config.status", status)
- clean.create("noarch-fake.rb")
+ clean.create("noarch-fake.rb", "require_relative 'cross'\n")
FileUtils.mkpath(hdrdir = "#{extout}/include/ruby")
File.binwrite("#{hdrdir}/config.h", "")
FileUtils.mkpath(defaults = "#{extout}/rubygems/defaults")
diff --git a/version.h b/version.h
index 1dde5034df..46df323e54 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
# 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 109
+#define RUBY_PATCHLEVEL 110
#define RUBY_RELEASE_YEAR 2022
#define RUBY_RELEASE_MONTH 10