diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-09 06:58:18 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-09 06:58:18 +0000 |
commit | 8566c29d1a8fca3dc777f5075851a2488ef244b9 (patch) | |
tree | f623b9e8d2fecebc3b2e7f1fe6bab13fc630fd3f /lib | |
parent | cbe130cea9df923618a0e9b1d984abb1fadf7e90 (diff) | |
download | ruby-8566c29d1a8fca3dc777f5075851a2488ef244b9.tar.gz |
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
Diffstat (limited to 'lib')
-rw-r--r-- | lib/mkmf.rb | 12 |
1 files 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 |