summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--gem_prelude.rb4
-rw-r--r--lib/rubygems.rb4
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7e7d47ee00..36a3292561 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Aug 8 16:08:51 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * gem_prelude.rb, lib/rubygems.rb (Gem.suffixes): return truely
+ require-able suffixes only.
+
Sun Aug 8 13:20:57 2010 Tanaka Akira <akr@fsij.org>
* ext/pathname/pathname.c (path_ftype): Pathname#ftype translated
diff --git a/gem_prelude.rb b/gem_prelude.rb
index 017adc2040..55fd9136dc 100644
--- a/gem_prelude.rb
+++ b/gem_prelude.rb
@@ -34,6 +34,10 @@ if defined?(Gem) then
:sitelibdir => RbConfig::CONFIG["sitelibdir"],
}
+ def self.suffixes
+ ['.rb', ".#{RbConfig::CONFIG["DLEXT"]}"]
+ end
+
def self.dir
@gem_home ||= nil
set_home(ENV['GEM_HOME'] || default_dir) unless @gem_home
diff --git a/lib/rubygems.rb b/lib/rubygems.rb
index fcb1ebd3db..552c6f6b57 100644
--- a/lib/rubygems.rb
+++ b/lib/rubygems.rb
@@ -903,8 +903,8 @@ module Gem
# Suffixes for require-able paths.
def self.suffixes
- ['', '.rb', '.rbw', '.so', '.bundle', '.dll', '.sl', '.jar']
- end
+ ['.rb', ".#{RbConfig::CONFIG["DLEXT"]}"]
+ end unless defined?(suffixes)
##
# Prints the amount of time the supplied block takes to run using the debug