mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Always enable rubygems/custom_require
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30602 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
6d6fe7fe6b
commit
b7dd8d07f6
2 changed files with 6 additions and 1 deletions
|
@ -3,6 +3,11 @@ Wed Jan 19 13:04:16 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
|
|||
* proc.c (proc_call): Add gc guard to avoid segfault. The fix
|
||||
is created by Tomoyuki Chikanaga. [Bug #4238][ruby-dev:42963]
|
||||
|
||||
Wed Jan 19 12:31:28 2011 Eric Hodel <drbrain@segment7.net>
|
||||
|
||||
* lib/rubygems.rb: Since gem_prelude requires rubygems, enable
|
||||
custom_require always.
|
||||
|
||||
Wed Jan 19 12:08:08 2011 Eric Hodel <drbrain@segment7.net>
|
||||
|
||||
* lib/rubygems/commands/dependency_command.rb: Remove require of
|
||||
|
|
|
@ -1223,7 +1223,7 @@ end
|
|||
# Ruby 1.9 allows --disable-gems, so we require it when we didn't detect a Gem
|
||||
# constant at rubygems.rb load time.
|
||||
|
||||
require 'rubygems/custom_require' unless RUBY_VERSION > '1.9'
|
||||
require 'rubygems/custom_require'
|
||||
|
||||
Gem.clear_paths
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue