1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mkmf.rb: macro assigments

Browse Source 
* lib/mkmf.rb ($configure_args): store macro assigments as-is, not
  only in option style.  e.g., ruby extconf.rb optflags=-O0

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50804 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-06-09 06:58:18 +00:00
parent 7ea2bb3235
commit c5e8342d4f
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/mkmf.rb
View File

@ -98,22 +98,16 @@ module MakeMakefile
arg, val = arg.split('=', 2) arg, val = arg.split('=', 2)
next unless arg next unless arg
arg.tr!('_', '-') arg.tr!('_', '-')
if arg.sub!(/^(?!--)/, '--') next if /\A(--)?(?:top|topsrc|src|cur)dir\z/i =~ arg
val or next
arg.downcase!
end
next if /^--(?:top|topsrc|src|cur)dir$/ =~ arg
$configure_args[arg] = val || true $configure_args[arg] = val || true
$configure_args["--#{arg.downcase}"] = val if val and /\A--/ !~ arg
end end
for arg in ARGV for arg in ARGV
arg, val = arg.split('=', 2) arg, val = arg.split('=', 2)
next unless arg next unless arg
arg.tr!('_', '-') arg.tr!('_', '-')
if arg.sub!(/^(?!--)/, '--')
val or next
arg.downcase!
end
$configure_args[arg] = val || true $configure_args[arg] = val || true
$configure_args["--#{arg.downcase}"] = val if val and /\A--/ !~ arg
end end
end end