diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-05-21 21:05:07 +0900 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-05-22 20:32:30 +0900 |
commit | 1d889c96562e9619d2cab443da711e82daeb983c (patch) | |
tree | 0a6a142360be987ceaff6cbf24a03fd5797ecb66 /lib/bundler/rubygems_gem_installer.rb | |
parent | 93ebf9643dc0913693157e6b4bb391a549a9b8ae (diff) |
Sync Bundler PR #3624 with HEAD commits
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/3114
Diffstat (limited to 'lib/bundler/rubygems_gem_installer.rb')
-rw-r--r-- | lib/bundler/rubygems_gem_installer.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/bundler/rubygems_gem_installer.rb b/lib/bundler/rubygems_gem_installer.rb index b1076b4554..8ce33c3953 100644 --- a/lib/bundler/rubygems_gem_installer.rb +++ b/lib/bundler/rubygems_gem_installer.rb @@ -4,12 +4,6 @@ require "rubygems/installer" module Bundler class RubyGemsGemInstaller < Gem::Installer - unless respond_to?(:at) - def self.at(*args) - new(*args) - end - end - def check_executable_overwrite(filename) # Bundler needs to install gems regardless of binstub overwriting end @@ -20,7 +14,7 @@ module Bundler def build_extensions extension_cache_path = options[:bundler_extension_cache_path] - return super unless extension_cache_path && extension_dir = Bundler.rubygems.spec_extension_dir(spec) + return super unless extension_cache_path && extension_dir = spec.extension_dir extension_dir = Pathname.new(extension_dir) build_complete = SharedHelpers.filesystem_access(extension_cache_path.join("gem.build_complete"), :read, &:file?) |