зеркало из https://github.com/github/ruby.git
* ext/extmk.rb: remove $makeflags.defined?, it should be $mflags.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30013 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
173f69146c
Коммит
1cdcd40ec8
|
@ -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>
|
Thu Dec 2 10:19:47 2010 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||||
|
|
||||||
* win32/Makefile.sub (rc): suppress meaningless message.
|
* win32/Makefile.sub (rc): suppress meaningless message.
|
||||||
|
|
|
@ -63,7 +63,7 @@ def extract_makefile(makefile, keep = true)
|
||||||
config = CONFIG.dup
|
config = CONFIG.dup
|
||||||
install_dirs(target_prefix).each {|var, val| config[var] = val}
|
install_dirs(target_prefix).each {|var, val| config[var] = val}
|
||||||
FileUtils.rm_f(installrb.values.collect {|f| RbConfig.expand(f, config)},
|
FileUtils.rm_f(installrb.values.collect {|f| RbConfig.expand(f, config)},
|
||||||
:verbose => $makeflags.defined?("Q") != "@")
|
:verbose => $mflags.defined?("Q") != "@")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
return false
|
return false
|
||||||
|
@ -239,7 +239,7 @@ end
|
||||||
|
|
||||||
def parse_args()
|
def parse_args()
|
||||||
$mflags = []
|
$mflags = []
|
||||||
$makeflags = []
|
$makeflags = [] # for make command to build ruby, so quoted
|
||||||
|
|
||||||
$optparser ||= OptionParser.new do |opts|
|
$optparser ||= OptionParser.new do |opts|
|
||||||
opts.on('-n') {$dryrun = true}
|
opts.on('-n') {$dryrun = true}
|
||||||
|
@ -299,10 +299,6 @@ def parse_args()
|
||||||
grep(/\A#{var}=(.*)/) {return $1}
|
grep(/\A#{var}=(.*)/) {return $1}
|
||||||
false
|
false
|
||||||
end
|
end
|
||||||
def $makeflags.defined?(var)
|
|
||||||
grep(/\A#{var}=(.*)/) {return $1}
|
|
||||||
false
|
|
||||||
end
|
|
||||||
|
|
||||||
if $mflags.set?(?n)
|
if $mflags.set?(?n)
|
||||||
$dryrun = true
|
$dryrun = true
|
||||||
|
|
Загрузка…
Ссылка в новой задаче