[前][次][番号順一覧][スレッド一覧]

ruby-changes:74005

From: nagachika <ko1@a...>
Date: Sat, 15 Oct 2022 17:28:36 +0900 (JST)
Subject: [ruby-changes:74005] 578f0313ed (ruby_3_1): merge revision(s) 7e4ac434b923739b540ce21cba307c4d0515d72e:

https://git.ruby-lang.org/ruby.git/commit/?id=578f0313ed

From 578f0313ed7e10d39242f2c7659dc24ae1953be6 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@r...>
Date: Sat, 15 Oct 2022 16:32:16 +0900
Subject: merge revision(s) 7e4ac434b923739b540ce21cba307c4d0515d72e:

	Skip build extensions again on cross compiling too

	---
	 tool/rbinstall.rb | 2 +-
	 1 file changed, 1 insertion(+), 1 deletion(-)
---
 tool/rbinstall.rb | 2 +-
 version.h         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index 2e1b6d4bd8..941e6a02ed 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -849,7 +849,7 @@ module RbInstall https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L849
     end
 
     def build_extensions
-    end if /mswin|mingw/ =~ RUBY_PLATFORM
+    end if /mswin|mingw/ =~ RUBY_PLATFORM || RbConfig::CONFIG["CROSS_COMPILING"] == "yes"
 
     def shebang(bin_file_name)
       path = File.join(gem_dir, spec.bindir, bin_file_name)
diff --git a/version.h b/version.h
index 8d6a959f18..5847fedf2c 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 82
+#define RUBY_PATCHLEVEL 83
 
 #define RUBY_RELEASE_YEAR 2022
 #define RUBY_RELEASE_MONTH 10
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]