diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2024-08-06 12:40:49 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2024-08-07 09:51:48 +0800 |
| commit | 5b0616b25ba8501c08e9b7fead28206ffaa3ab60 (patch) | |
| tree | 9d5f131cf968ba479ec9790214c8a680c972c0da | |
| parent | b763a90fe1be5f335effcb285cc5d72d26629493 (diff) | |
Revert "Backport https://github.com/ruby/ruby/pull/7321"
This reverts commit 76c61c9993e59af0b4c400b44f169f4af99c3efa.
| -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 ba2739fa49..8534cf75a3 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -1045,12 +1045,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}") |
