diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2024-08-01 13:19:17 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2024-08-06 18:59:52 +0900 |
| commit | b62e1df3a1527c811f7fe857423023a479bc807f (patch) | |
| tree | 494eab915995dcfc8550ebc619d4bd16b2dc102d | |
| parent | 7fc6448ec7f7505ca5772af0a60ee780c321492c (diff) | |
Revert "Backport [Bug #19158] for Ruby 3.2 (#7356)"
This reverts commit 65ab2c1ef23bd4a02120a27c371dce12ea9024d4.
| -rwxr-xr-x | tool/rbinstall.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index f910fca57b..02ce7faaa7 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -1026,12 +1026,9 @@ install?(:ext, :comm, :gem, :'bundled-gems') do next if /^\s*(?:#|$)/ =~ name next unless /^(\S+)\s+(\S+).*/ =~ name gem_name = "#$1-#$2" - # Try to find the gemspec file for C ext gems - # ex .bundle/gems/debug-1.7.1/debug-1.7.1.gemspec - # This gemspec keep the original dependencies - path = "#{srcdir}/.bundle/gems/#{gem_name}/#{gem_name}.gemspec" + path = "#{srcdir}/.bundle/specifications/#{gem_name}.gemspec" unless File.exist?(path) - path = "#{srcdir}/.bundle/specifications/#{gem_name}.gemspec" + path = "#{srcdir}/.bundle/gems/#{gem_name}/#{gem_name}.gemspec" next unless File.exist?(path) end spec = load_gemspec(path, "#{srcdir}/.bundle/gems/#{gem_name}") |
