diff options
| -rwxr-xr-x | tool/rbinstall.rb | 8 | ||||
| -rw-r--r-- | version.h | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index b7ecb9a47b..b643fc8676 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -1034,6 +1034,13 @@ install?(:ext, :comm, :gem, :'bundled-gems') do specifications_dir = File.join(gem_dir, "specifications") build_dir = Gem::StubSpecification.gemspec_stub("", ".bundle", ".bundle").extensions_dir + # We are about to build extensions, and want to configure extensions with the + # newly installed ruby. + Gem.instance_variable_set(:@ruby, with_destdir(File.join(bindir, ruby_install_name))) + # Prevent fake.rb propagation. It conflicts with the natural mkmf configs of + # the newly installed ruby. + ENV.delete('RUBYOPT') + File.foreach("#{srcdir}/gems/bundled_gems") do |name| next if /^\s*(?:#|$)/ =~ name next unless /^(\S+)\s+(\S+).*/ =~ name @@ -1061,7 +1068,6 @@ install?(:ext, :comm, :gem, :'bundled-gems') do end next if gems.empty? if defined?(Zlib) - Gem.instance_variable_set(:@ruby, with_destdir(File.join(bindir, ruby_install_name))) silent = Gem::SilentUI.new gems.each do |gem| package = Gem::Package.new(gem) @@ -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 84 +#define RUBY_PATCHLEVEL 85 #define RUBY_RELEASE_YEAR 2022 #define RUBY_RELEASE_MONTH 10 |