[前][次][番号順一覧][スレッド一覧]

ruby-changes:33636

From: nobu <ko1@a...>
Date: Fri, 25 Apr 2014 16:11:11 +0900 (JST)
Subject: [ruby-changes:33636] nobu:r45717 (trunk): mkmf.rb: workaround for tmpdir

nobu	2014-04-25 16:11:03 +0900 (Fri, 25 Apr 2014)

  New Revision: 45717

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=45717

  Log:
    mkmf.rb: workaround for tmpdir
    
    * lib/mkmf.rb (try_link0): workaround for miniruby as 'tmpdir.rb'
      always requires 'etc.so' now.

  Modified files:
    trunk/lib/mkmf.rb
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 45716)
+++ lib/mkmf.rb	(revision 45717)
@@ -528,6 +528,11 @@ MSG https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L528
   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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]