ngoto	2015-06-10 22:37:03 +0900 (Wed, 10 Jun 2015)

  New Revision: 50815

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=50815

  Log:
    * lib/mkmf.rb: revert r50804 because of build failure when specifying
      LDFLAGS during configure, observed on Solaris with GCC 4.6.
      [Bug #11245]

  Modified files:
    trunk/ChangeLog
    trunk/lib/mkmf.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 50814)
+++ ChangeLog	(revision 50815)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Jun 10 22:27:32 2015  Naohisa Goto  <ngotogenome@g...>
+
+	* 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@m...>
 
 	* README.ja.md: fix markup miss.
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 50814)
+++ lib/mkmf.rb	(revision 50815)
@@ -98,16 +98,22 @@ module MakeMakefile https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L98
       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
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/