diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/mkmf.rb | 12 |
2 files changed, 15 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Wed Jun 10 22:27:32 2015 Naohisa Goto <ngotogenome@gmail.com> + + * 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 <zn@mbf.nifty.com> * 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 |