nagachika	2018-10-09 23:09:35 +0900 (Tue, 09 Oct 2018)

  New Revision: 64979

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

  Log:
    merge revision(s) 62007,62024: [Backport #13069]
    
    mkmf.rb: ignore linker warnings
    
    * lib/mkmf.rb (try_ldflags): ignore linker warnings.  they cause
      unexpected failures on OpenBSD.  [ruby-core:78827] [Bug #13069]
    
    mkmf.rb: werror on mswin
    
    * lib/mkmf.rb (MakeMakefile#try_ldflags): enable warning checking
      on mswin, link.exe warns -l options but does not fail.
      [Bug #13069]

  Modified directories:
    branches/ruby_2_5/
  Modified files:
    branches/ruby_2_5/lib/mkmf.rb
    branches/ruby_2_5/version.h
Index: ruby_2_5/lib/mkmf.rb
===================================================================
--- ruby_2_5/lib/mkmf.rb	(revision 64978)
+++ ruby_2_5/lib/mkmf.rb	(revision 64979)
@@ -657,7 +657,8 @@ MSG https://github.com/ruby/ruby/blob/trunk/ruby_2_5/lib/mkmf.rb#L657
   end
 
   def try_ldflags(flags, opts = {})
-    try_link(MAIN_DOES_NOTHING, flags, {:werror => true}.update(opts))
+    opts = {:werror => true}.update(opts) if $mswin
+    try_link(MAIN_DOES_NOTHING, flags, opts)
   end
 
   def append_ldflags(flags, *opts)
Index: ruby_2_5/version.h
===================================================================
--- ruby_2_5/version.h	(revision 64978)
+++ ruby_2_5/version.h	(revision 64979)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/version.h#L1
 #define RUBY_VERSION "2.5.2"
 #define RUBY_RELEASE_DATE "2018-10-09"
-#define RUBY_PATCHLEVEL 92
+#define RUBY_PATCHLEVEL 93
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 10
Index: ruby_2_5
===================================================================
--- ruby_2_5	(revision 64978)
+++ ruby_2_5	(revision 64979)

Property changes on: ruby_2_5
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r62007,62024

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