summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-04-18 23:38:16 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-04-18 23:38:16 +0000
commit41d5646a32fb28fc23394146c0ff882770d595a4 (patch)
treef3bf8e28e2e0349efd8d7cfcfe62fc82cc9de004
parentd1309ecd49eedc134643def84429da310927daa4 (diff)
downloadruby-41d5646a32fb28fc23394146c0ff882770d595a4.tar.gz
ruby-41d5646a32fb28fc23394146c0ff882770d595a4.tar.xz
ruby-41d5646a32fb28fc23394146c0ff882770d595a4.zip
* eval.c (search_required): handle static linked extensions.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8353 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--eval.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b32263b95..3d2a71cad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Tue Apr 19 00:01:08 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Apr 19 08:38:07 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (search_required, rb_require_safe): expand path in
rb_features. [ruby-dev:26079]
@@ -7,6 +7,8 @@ Tue Apr 19 00:01:08 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/extmk.rb: expand path for ext/**/extconf.rb.
+ * eval.c (search_required): handle static linked extensions.
+
Mon Apr 18 15:37:35 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_attr): attribute name check added.
diff --git a/eval.c b/eval.c
index b3cc629c2..73f04ce86 100644
--- a/eval.c
+++ b/eval.c
@@ -6916,6 +6916,9 @@ search_required(fname, path)
}
}
}
+ else if (!strchr(ftptr, '/')) {
+ if (rb_feature_p(ftptr, 0, Qfalse)) return 's';
+ }
tmp = fname;
type = rb_find_file_ext(&tmp, loadable_ext);
tmp = rb_file_expand_path(tmp, Qnil);