diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-11 08:57:40 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-11 08:57:40 +0000 |
| commit | 771f2d10a3a8516ae7bf504741f9ad95031b804a (patch) | |
| tree | 80a33237c8bb2e3d2e86c3fae465d967e6d07d0a | |
| parent | 5fed7fa3490621c97596360b50693a53da1f5bee (diff) | |
* configure.in (MINIRUBY): should not include extension library path.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@16357 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | ext/purelib.rb | 2 |
3 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Sun May 11 17:57:36 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (MINIRUBY): should not include extension library path. + Sun May 11 10:36:10 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> * eval.c (method_name, method_owner): New methods; backported diff --git a/configure.in b/configure.in index 55600b37e4..0dd53a9e90 100644 --- a/configure.in +++ b/configure.in @@ -1402,6 +1402,7 @@ if test x"$cross_compiling" = xyes; then RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`' else MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib' + MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common -I./- -r$(srcdir)/ext/purelib.rb' PREP='miniruby$(EXEEXT)' RUNRUBY='$(MINIRUBY) $(srcdir)/runruby.rb --extout=$(EXTOUT)' fi diff --git a/ext/purelib.rb b/ext/purelib.rb index 10ee06176c..284254a8b4 100644 --- a/ext/purelib.rb +++ b/ext/purelib.rb @@ -1,3 +1,3 @@ -if nul = $:.index("-") +if nul = $:.find_index {|path| /\A(?:\.\/)*-\z/ =~ path} $:[nul..-1] = ["."] end |