diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-08 08:44:15 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-08 08:44:15 +0000 |
| commit | b745b792e6ed67a714bad1604968947d95f1dbf7 (patch) | |
| tree | af7453c590f1b46e1c54ed55eadffc3890598b3c | |
| parent | 279b358d00264f5bb7034142aab51753edfe36de (diff) | |
* common.mk, ext/extmk.rb, lib/mkmf.rb: use absolute path for RUBYOPT.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16334 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | ext/extmk.rb | 3 | ||||
| -rw-r--r-- | lib/mkmf.rb | 2 |
4 files changed, 6 insertions, 5 deletions
@@ -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. gcc version 4.1.2 20061115 (prerelease) (Debian 4.1.1-21) optimizes @@ -5,7 +5,7 @@ dll: $(LIBRUBY_SO) .SUFFIXES: .inc RUBYLIB = - -RUBYOPT = +RUBYOPT = -rpurelib.rb STATIC_RUBY = static-ruby diff --git a/ext/extmk.rb b/ext/extmk.rb index 12400ace4d..309baa9b3f 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -350,7 +350,7 @@ unless CROSS_COMPILING $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 @@ if $nmake == ?b end end $mflags.unshift("topdir=#$topdir") +ENV.delete("RUBYOPT") system($make, *sysquote($mflags)) or exit($?.exitstatus) #Local variables: diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 4ef54fd4f1..b63dfb857d 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1312,7 +1312,7 @@ arch_hdrdir = #{$arch_hdrdir} 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" |