ruby-changes:4839
From: ko1@a...
Date: Thu, 8 May 2008 17:29:48 +0900 (JST)
Subject: [ruby-changes:4839] nobu - Ruby:r16333 (trunk): * common.mk, ext/extmk.rb, lib/mkmf.rb: removed RUBYOPT.
nobu 2008-05-08 17:29:24 +0900 (Thu, 08 May 2008) New Revision: 16333 Modified files: trunk/ChangeLog trunk/common.mk trunk/ext/extmk.rb trunk/lib/mkmf.rb Log: * common.mk, ext/extmk.rb, lib/mkmf.rb: removed RUBYOPT. http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16333&r2=16332&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/mkmf.rb?r1=16333&r2=16332&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/extmk.rb?r1=16333&r2=16332&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/common.mk?r1=16333&r2=16332&diff_format=u Index: ChangeLog =================================================================== --- ChangeLog (revision 16332) +++ ChangeLog (revision 16333) @@ -1,5 +1,7 @@ -Thu May 8 16:46:06 2008 Tanaka Akira <akr@f...> +Thu May 8 17:29:22 2008 Nobuyoshi Nakada <nobu@r...> + * common.mk, ext/extmk.rb, lib/mkmf.rb: removed 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 load_path by holding only RARRAY_LEN(load_path) and Index: lib/mkmf.rb =================================================================== --- lib/mkmf.rb (revision 16332) +++ lib/mkmf.rb (revision 16333) @@ -1312,7 +1312,7 @@ VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])} } if $extmk - mk << "RUBYLIB = -\nRUBYOPT = -rpurelib.rb\n" + mk << "RUBYLIB = -\nRUBYOPT =\n" end if destdir = CONFIG["prefix"][$dest_prefix_pattern, 1] mk << "\nDESTDIR = #{destdir}\n" Index: common.mk =================================================================== --- common.mk (revision 16332) +++ common.mk (revision 16333) @@ -5,7 +5,7 @@ .SUFFIXES: .inc RUBYLIB = - -RUBYOPT = -rpurelib.rb +RUBYOPT = STATIC_RUBY = static-ruby Index: ext/extmk.rb =================================================================== --- ext/extmk.rb (revision 16332) +++ ext/extmk.rb (revision 16333) @@ -350,7 +350,7 @@ $ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout $ruby << " -I./- -I'$(top_srcdir)/ext' -rpurelib.rb" ENV["RUBYLIB"] = "-" - ENV["RUBYOPT"] = "-rpurelib.rb" + ENV.delete("RUBYOPT") end $config_h = '$(arch_hdrdir)/ruby/config.h' $mflags << "ruby=#$ruby" @@ -555,7 +555,6 @@ 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/