From c5e8342d4f6e0cec730497ead5c67226d212a104 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 9 Jun 2015 06:58:18 +0000 Subject: mkmf.rb: macro assigments * 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 --- lib/mkmf.rb | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 0d19562db6..415f149fe4 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -98,22 +98,16 @@ module MakeMakefile arg, val = arg.split('=', 2) next unless arg arg.tr!('_', '-') - if arg.sub!(/^(?!--)/, '--') - val or next - arg.downcase! - end - next if /^--(?:top|topsrc|src|cur)dir$/ =~ arg + next if /\A(--)?(?:top|topsrc|src|cur)dir\z/i =~ arg $configure_args[arg] = val || true + $configure_args["--#{arg.downcase}"] = val if val and /\A--/ !~ arg end for arg in ARGV arg, val = arg.split('=', 2) next unless arg arg.tr!('_', '-') - if arg.sub!(/^(?!--)/, '--') - val or next - arg.downcase! - end $configure_args[arg] = val || true + $configure_args["--#{arg.downcase}"] = val if val and /\A--/ !~ arg end end -- cgit v1.2.3