nobu	2008-05-08 17:44:15 +0900 (Thu, 08 May 2008)

  New Revision: 16334

  Modified files:
    trunk/ChangeLog
    trunk/common.mk
    trunk/ext/extmk.rb
    trunk/lib/mkmf.rb

  Log:
    * common.mk, ext/extmk.rb, lib/mkmf.rb: use absolute path for RUBYOPT.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16334&r2=16333&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/mkmf.rb?r1=16334&r2=16333&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/extmk.rb?r1=16334&r2=16333&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/common.mk?r1=16334&r2=16333&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 16333)
+++ ChangeLog	(revision 16334)
@@ -1,6 +1,6 @@
-Thu May  8 17:29:22 2008  Nobuyoshi Nakada  <nobu@r...>
+Thu May  8 17:44:13 2008  Nobuyoshi Nakada  <nobu@r...>
 
-	* common.mk, ext/extmk.rb, lib/mkmf.rb: removed RUBYOPT.
+	* common.mk, ext/extmk.rb, lib/mkmf.rb: use absolute path for RUBYOPT.
 
 	* file.c (rb_find_file_ext): guard load_path from GC.
 	  gcc version 4.1.2 20061115 (prerelease) (Debian 4.1.1-21) optimizes
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 16333)
+++ lib/mkmf.rb	(revision 16334)
@@ -1312,7 +1312,7 @@
 VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
 }
   if $extmk
-    mk << "RUBYLIB = -\nRUBYOPT =\n"
+    mk << "RUBYLIB = -\nRUBYOPT = -r$(top_srcdir)/ext/purelib.rb\n"
   end
   if destdir = CONFIG["prefix"][$dest_prefix_pattern, 1]
     mk << "\nDESTDIR = #{destdir}\n"
Index: common.mk
===================================================================
--- common.mk	(revision 16333)
+++ common.mk	(revision 16334)
@@ -5,7 +5,7 @@
 .SUFFIXES: .inc
 
 RUBYLIB       = -
-RUBYOPT       =
+RUBYOPT       = -rpurelib.rb
 
 STATIC_RUBY   = static-ruby
 
Index: ext/extmk.rb
===================================================================
--- ext/extmk.rb	(revision 16333)
+++ ext/extmk.rb	(revision 16334)
@@ -350,7 +350,7 @@
   $ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout
   $ruby << " -I./- -I'$(top_srcdir)/ext' -rpurelib.rb"
   ENV["RUBYLIB"] = "-"
-  ENV.delete("RUBYOPT")
+  ENV["RUBYOPT"] = "-r#{File.expand_path('ext/purelib.rb', $top_srcdir)}"
 end
 $config_h = '$(arch_hdrdir)/ruby/config.h'
 $mflags << "ruby=#$ruby"
@@ -555,6 +555,7 @@
   end
 end
 $mflags.unshift("topdir=#$topdir")
+ENV.delete("RUBYOPT")
 system($make, *sysquote($mflags)) or exit($?.exitstatus)
 
 #Local variables:

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