diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | ext/extmk.rb | 8 |
2 files changed, 6 insertions, 6 deletions
@@ -1,3 +1,7 @@ +Thu Dec 2 10:38:40 2010 NARUSE, Yui <naruse@ruby-lang.org> + + * ext/extmk.rb: remove $makeflags.defined?, it should be $mflags. + Thu Dec 2 10:19:47 2010 NAKAMURA Usaku <usa@ruby-lang.org> * win32/Makefile.sub (rc): suppress meaningless message. diff --git a/ext/extmk.rb b/ext/extmk.rb index f458519cfb..44c0b94aa8 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -63,7 +63,7 @@ def extract_makefile(makefile, keep = true) config = CONFIG.dup install_dirs(target_prefix).each {|var, val| config[var] = val} FileUtils.rm_f(installrb.values.collect {|f| RbConfig.expand(f, config)}, - :verbose => $makeflags.defined?("Q") != "@") + :verbose => $mflags.defined?("Q") != "@") end end return false @@ -239,7 +239,7 @@ end def parse_args() $mflags = [] - $makeflags = [] + $makeflags = [] # for make command to build ruby, so quoted $optparser ||= OptionParser.new do |opts| opts.on('-n') {$dryrun = true} @@ -299,10 +299,6 @@ def parse_args() grep(/\A#{var}=(.*)/) {return $1} false end - def $makeflags.defined?(var) - grep(/\A#{var}=(.*)/) {return $1} - false - end if $mflags.set?(?n) $dryrun = true |