diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-17 09:22:24 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-17 09:22:24 +0000 |
commit | 2a13a71e80e2be2dbc84ba3d9eeb0b3100345869 (patch) | |
tree | fe77d45e767a8eddc98569075ae6adae533e5c53 | |
parent | a04a5fc18b7436eeccd7520d73d16f25f9f41b87 (diff) |
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_4@65117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | lib/mkmf.rb | 3 | ||||
-rw-r--r-- | version.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 533f3f85ce..3b218eec55 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -655,7 +655,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) @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.4.5" #define RUBY_RELEASE_DATE "2018-10-17" -#define RUBY_PATCHLEVEL 331 +#define RUBY_PATCHLEVEL 332 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 10 |