1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* lib/rubygems: Update to RubyGems master f738c67. Changes:

Fixed test bug for ruby with ENABLE_SHARED = no

* test/rubygems:  ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
drbrain 2013-10-17 21:03:49 +00:00
parent ef761f0888
commit 4fa08bbaf8
5 changed files with 46 additions and 27 deletions

View file

@ -63,15 +63,8 @@ class Gem::BasicSpecification
# end
def extension_install_dir
ruby_api_version =
if 'no' == RbConfig::CONFIG['ENABLE_SHARED'] then
"#{Gem.ruby_api_version}-static"
else
Gem.ruby_api_version
end
File.join base_dir, 'extensions', Gem::Platform.local.to_s,
ruby_api_version, full_name
Gem.extension_api_version, full_name
end
def find_full_gem_path # :nodoc:
@ -184,7 +177,7 @@ class Gem::BasicSpecification
relative_extension_install_dir =
File.join '..', '..', '..', 'extensions', Gem::Platform.local.to_s,
Gem.ruby_api_version, full_name
Gem.extension_api_version, full_name
@require_paths + [relative_extension_install_dir]
end