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

mkmf.rb: Refactor splitting configure_args and remove duplicate code

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2023-01-06 12:23:25 +09:00
parent cd7e14da4e
commit b94656147b
Notes: git 2023-01-06 11:01:13 +00:00 
Merged: https://github.com/ruby/ruby/pull/7076
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/mkmf.rb
View File

@ -89,26 +89,16 @@ module MakeMakefile
unless defined? $configure_args unless defined? $configure_args
$configure_args = {} $configure_args = {}
args = CONFIG["configure_args"] args = CONFIG["configure_args"].shellsplit
if ENV["CONFIGURE_ARGS"] if arg = ENV["CONFIGURE_ARGS"]
args << " " << ENV["CONFIGURE_ARGS"] args.push(*arg.shellsplit)
end end
for arg in Shellwords::shellwords(args) args.delete_if {|a| /\A--(?:top(?:src)?|src|cur)dir(?=\z|=)/ =~ a}
for arg in args.concat(ARGV)
arg, val = arg.split('=', 2) arg, val = arg.split('=', 2)
next unless arg next unless arg
arg.tr!('_', '-') arg.tr!('_', '-')
if arg.sub!(/^(?!--)/, '--') if arg.sub!(/\A(?!--)/, '--')
val or next
arg.downcase!
end
next if /^--(?:top|topsrc|src|cur)dir$/ =~ arg
$configure_args[arg] = val || true
end
for arg in ARGV
arg, val = arg.split('=', 2)
next unless arg
arg.tr!('_', '-')
if arg.sub!(/^(?!--)/, '--')
val or next val or next
arg.downcase! arg.downcase!
end end