From edb8c7a9f3a9e862355a0c30ea7ba040d48759ff Mon Sep 17 00:00:00 2001 From: ngoto Date: Wed, 10 Jun 2015 13:37:03 +0000 Subject: * lib/mkmf.rb: revert r50804 because of build failure when specifying LDFLAGS during configure, observed on Solaris with GCC 4.6. [Bug #11245] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50815 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/mkmf.rb | 12 +++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0b785811c3..ebd3387d0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Jun 10 22:27:32 2015 Naohisa Goto + + * lib/mkmf.rb: revert r50804 because of build failure when specifying + LDFLAGS during configure, observed on Solaris with GCC 4.6. + [Bug #11245] + Wed Jun 10 21:59:51 2015 Kazuhiro NISHIYAMA * README.ja.md: fix markup miss. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 415f149fe4..0d19562db6 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -98,16 +98,22 @@ module MakeMakefile arg, val = arg.split('=', 2) next unless arg arg.tr!('_', '-') - next if /\A(--)?(?:top|topsrc|src|cur)dir\z/i =~ arg + if arg.sub!(/^(?!--)/, '--') + val or next + arg.downcase! + end + next if /^--(?:top|topsrc|src|cur)dir$/ =~ 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