summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-02 22:52:25 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-02 22:52:25 +0000
commit45992b4b252b015702581589c584a61831346416 (patch)
treefa01a14e2386c8d241e2449989176b84e623e845
parentcefa9413d24ce1c253516d0a6901c9aaed11f45f (diff)
* ext/purelib.rb: no longer used since the default load path of
miniruby is empty. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28840 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--configure.in2
-rwxr-xr-x[-rw-r--r--]ext/extmk.rb1
-rw-r--r--ext/purelib.rb17
-rw-r--r--lib/mkmf.rb2
5 files changed, 7 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index fae768a87c..bb797e21cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 3 07:52:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/purelib.rb: no longer used since the default load path of
+ miniruby is empty.
+
Tue Aug 3 00:53:47 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* insns.def, vm_core.h: fixed typo. reported by Rocky Bernstein
diff --git a/configure.in b/configure.in
index afe575d45a..7afaea97f3 100644
--- a/configure.in
+++ b/configure.in
@@ -2052,7 +2052,7 @@ if test x"$cross_compiling" = xyes; then
TEST_RUNNABLE=no
else
MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib'
- MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common -I./- -r$(srcdir)/ext/purelib.rb'
+ MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common'
PREP='miniruby$(EXEEXT)'
RUNRUBY='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT)'
XRUBY='$(RUNRUBY)'
diff --git a/ext/extmk.rb b/ext/extmk.rb
index ab48634c1a..c5c61c4736 100644..100755
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -351,7 +351,6 @@ $ruby << " -I'$(topdir)'"
unless CROSS_COMPILING
$ruby << " -I'$(top_srcdir)/lib'"
$ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout
- $ruby << " -I./- -I'$(top_srcdir)/ext' -rpurelib.rb"
ENV["RUBYLIB"] = "-"
ENV["RUBYOPT"] = "-r#{File.expand_path('ext/purelib.rb', $top_srcdir)}"
end
diff --git a/ext/purelib.rb b/ext/purelib.rb
deleted file mode 100644
index cc1a00bdb2..0000000000
--- a/ext/purelib.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-nul = nil
-$:.each_with_index {|path, index|
- if /\A(?:\.\/)*-\z/ =~ path
- nul = index
- break
- end
-}
-if nul
- removed, $:[nul..-1] = $:[nul..-1], []
- if defined?(Gem::QuickLoader)
- removed.each do |path|
- # replaces a fake rubygems by gem_prelude.rb with an alternative path
- index = $".index(File.join(path, 'rubygems.rb'))
- $"[index] = Gem::QuickLoader.path_to_full_rubygems_library if index
- end
- end
-end
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index c1cd3dfefb..12d20bd582 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1480,7 +1480,7 @@ arch_hdrdir = #{$arch_hdrdir}
VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
}
if $extmk
- mk << "RUBYLIB = -\nRUBYOPT = -r$(top_srcdir)/ext/purelib.rb\n"
+ mk << "RUBYLIB =\n""RUBYOPT = -\n"
end
if destdir = CONFIG["prefix"][$dest_prefix_pattern, 1]
mk << "\nDESTDIR = #{destdir}\n"