Be sure to load the custom require even if --disable-rubygems was used

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28695 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 3 deletions

diff --git a/lib/rubygems.rb b/lib/rubygems.rb
index 42e189ed4a..fcb1ebd3db 100644
--- a/lib/rubygems.rb
+++ b/lib/rubygems.rb
@@ -1124,9 +1124,12 @@ end
 ##
 # Enables the require hook for RubyGems.
 #
-# We remove the paths prelude added, so we need custom require to get
-# any gems now.
-# require 'rubygems/custom_require'
+# if --disable-rubygems was used, then the prelude wasn't loaded, so
+# we need to load the custom_require now.
+
+if gem_disabled
+  require 'rubygems/custom_require'
+end
 
 Gem.clear_paths