From b014387f68411f16c502a25982c4e26df27887c7 Mon Sep 17 00:00:00 2001 From: nagachika Date: Tue, 9 Oct 2018 14:09:35 +0000 Subject: 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@64979 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/mkmf.rb | 3 ++- version.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 7f53bb4b97..74b42289b1 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -657,7 +657,8 @@ MSG 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) diff --git a/version.h b/version.h index ef4ef1e076..36c819717e 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #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 -- cgit v1.2.3