diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-09 14:09:35 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-09 14:09:35 +0000 |
commit | b014387f68411f16c502a25982c4e26df27887c7 (patch) | |
tree | 0bde356506163383d6ce3f18433e0c1b761a7dfc /lib | |
parent | c14ab348a1bce037e8c1f50a0504a11379a90887 (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_5@64979 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/mkmf.rb | 3 |
1 files changed, 2 insertions, 1 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) |