* (lib/tmpdir.rb): Rescue LoadError on etc.so for miniruby.

Revert r45707, r45711, r45717.



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

ChangeLog

@@ -1,3 +1,8 @@
+Tue Apr 29 14:17:57 2014  Tanaka Akira  <akr@fsij.org>
+
+	* (lib/tmpdir.rb): Rescue LoadError on etc.so for miniruby.
+	  Revert r45707, r45711, r45717.
+
 Tue Apr 29 12:50:02 2014  Tanaka Akira  <akr@fsij.org>
 
 	* lib/fileutils.rb: Don't need to define fu_get_gid and fu_get_gid in

bootstraptest/test_io.rb

@@ -42,7 +42,6 @@ assert_finish 1, %q{
 }
 
 assert_equal 'ok', %q{
-  $" << 'etc.so'
   require 'tmpdir'
   begin
     tmpname = "#{Dir.tmpdir}/ruby-btest-#{$$}-#{rand(0x100000000).to_s(36)}"
@@ -59,7 +58,6 @@ assert_equal 'ok', %q{
 }
 
 assert_equal 'ok', %q{
-  $" << 'etc.so'
   require 'tmpdir'
   begin
     tmpname = "#{Dir.tmpdir}/ruby-btest-#{$$}-#{rand(0x100000000).to_s(36)}"

lib/mkmf.rb

@@ -528,11 +528,6 @@ MSG
   def try_link0(src, opt="", *opts, &b) # :nodoc:
     cmd = link_command("", opt)
     if $universal
-      begin
-        require 'etc'
-      rescue LoadError
-        $" << 'etc.so'
-      end
       require 'tmpdir'
       Dir.mktmpdir("mkmf_", oldtmpdir = ENV["TMPDIR"]) do |tmpdir|
         begin

lib/tmpdir.rb

@@ -5,7 +5,10 @@
 #
 
 require 'fileutils'
-require 'etc.so'
+begin
+  require 'etc.so'
+rescue LoadError # rescue LoadError for miniruby
+end
 
 class Dir