зеркало из https://github.com/github/ruby.git
* 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
This commit is contained in:
Родитель
279b358d00
Коммит
b745b792e6
|
@ -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
|
||||
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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"
|
||||
|
|
Загрузка…
Ссылка в новой задаче