kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/mkmf.rb: fix r33904 and revert r33905. initialize global

Browse source 
variables with init_mkmf before initializing constants.
  [ruby-dev:45124] [Bug #5879]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34279 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-01-12 09:44:34 +00:00
parent ca22731439
commit 912b6606b3
2 changed files with 69 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Thu Jan 12 18:44:31 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb: fix r33904 and revert r33905. initialize global
variables with init_mkmf before initializing constants.
[ruby-dev:45124] [Bug #5879]
Thu Jan 12 13:51:00 2012 NARUSE, Yui <naruse@ruby-lang.org> Thu Jan 12 13:51:00 2012 NARUSE, Yui <naruse@ruby-lang.org>
* cont.c (cont_restore_0): prevent optimizing out `sp'. sp is used for * cont.c (cont_restore_0): prevent optimizing out `sp'. sp is used for

12
lib/mkmf.rb
View file

@ -53,8 +53,6 @@ module MakeMakefile
$static = nil $static = nil
$config_h = '$(arch_hdrdir)/ruby/config.h' $config_h = '$(arch_hdrdir)/ruby/config.h'
$default_static = $static $default_static = $static
$OBJEXT = nil
$ignore_error = ''
unless defined? $configure_args unless defined? $configure_args
$configure_args = {} $configure_args = {}
@ -2273,11 +2271,7 @@ MESSAGE
end end
end end
# Initializes mkmf for creating a makefile. extend self
#
# Internal use only.
#
def make_makefile
init_mkmf init_mkmf
$make = with_config("make-prog", ENV["MAKE"] || "make") $make = with_config("make-prog", ENV["MAKE"] || "make")
@ -2305,7 +2299,6 @@ MESSAGE
end end
$configure_args["--topdir"] ||= $curdir $configure_args["--topdir"] ||= $curdir
$ruby = arg_config("--ruby", File.join(RbConfig::CONFIG["bindir"], CONFIG["ruby_install_name"])) $ruby = arg_config("--ruby", File.join(RbConfig::CONFIG["bindir"], CONFIG["ruby_install_name"]))
end
# :startdoc: # :startdoc:
@ -2374,6 +2367,3 @@ include MakeMakefile
if not $extmk and /\A(extconf|makefile).rb\z/ =~ File.basename($0) if not $extmk and /\A(extconf|makefile).rb\z/ =~ File.basename($0)
END {mkmf_failed($0)} END {mkmf_failed($0)}
end end
make_makefile