1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16334 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-05-08 08:44:15 +00:00
parent 279b358d00
commit b745b792e6
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,6 +1,6 @@
Thu May 8 17:29:22 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu May 8 17:44:13 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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. * file.c (rb_find_file_ext): guard load_path from GC.
gcc version 4.1.2 20061115 (prerelease) (Debian 4.1.1-21) optimizes gcc version 4.1.2 20061115 (prerelease) (Debian 4.1.1-21) optimizes

2
common.mk
View File

@ -5,7 +5,7 @@ dll: $(LIBRUBY_SO)
.SUFFIXES: .inc .SUFFIXES: .inc
RUBYLIB = - RUBYLIB = -
RUBYOPT = RUBYOPT = -rpurelib.rb
STATIC_RUBY = static-ruby STATIC_RUBY = static-ruby

3
ext/extmk.rb
View File

@ -350,7 +350,7 @@ unless CROSS_COMPILING
$ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout $ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout
$ruby << " -I./- -I'$(top_srcdir)/ext' -rpurelib.rb" $ruby << " -I./- -I'$(top_srcdir)/ext' -rpurelib.rb"
ENV["RUBYLIB"] = "-" ENV["RUBYLIB"] = "-"
ENV.delete("RUBYOPT") ENV["RUBYOPT"] = "-r#{File.expand_path('ext/purelib.rb', $top_srcdir)}"
end end
$config_h = '$(arch_hdrdir)/ruby/config.h' $config_h = '$(arch_hdrdir)/ruby/config.h'
$mflags << "ruby=#$ruby" $mflags << "ruby=#$ruby"
@ -555,6 +555,7 @@ if $nmake == ?b
end end
end end
$mflags.unshift("topdir=#$topdir") $mflags.unshift("topdir=#$topdir")
ENV.delete("RUBYOPT")
system($make, *sysquote($mflags)) or exit($?.exitstatus) system($make, *sysquote($mflags)) or exit($?.exitstatus)
#Local variables: #Local variables:

2
lib/mkmf.rb
View File

@ -1312,7 +1312,7 @@ arch_hdrdir = #{$arch_hdrdir}
VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])} VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
} }
if $extmk if $extmk
mk << "RUBYLIB = -\nRUBYOPT =\n" mk << "RUBYLIB = -\nRUBYOPT = -r$(top_srcdir)/ext/purelib.rb\n"
end end
if destdir = CONFIG["prefix"][$dest_prefix_pattern, 1] if destdir = CONFIG["prefix"][$dest_prefix_pattern, 1]
mk << "\nDESTDIR = #{destdir}\n" mk << "\nDESTDIR = #{destdir}\n"