summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-06 23:00:47 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-06 23:00:47 +0000
commite806b0fed77d94ea426bfc0269ab3b01feaf218c (patch)
tree5aa43038a1abc563e3c2d7d8c809d6ca1938a9c2 /win32
parent75877a30a49708d6bd2a883b1bb066aacb76f111 (diff)
* configure.in, win32/Makefile.sub (WERRORFLAG): flag to treat
warnings as errors. * lib/mkmf.rb (Logging.postpone): yield log file object. * lib/mkmf.rb (xsystem): add options, :werror only right now. * lib/mkmf.rb (with_werror): check as if warnings are errors. * lib/mkmf.rb (convertible_int): make declaration conflict warnings errors not to pass wrong type. [ruby-dev:42684] * lib/mkmf.rb (COMMON_MACROS): get rid of conflicts. * win32/Makefile.sub (WARNFLAGS): make declaration conflict warnings errors if possible. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30107 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile.sub4
1 files changed, 3 insertions, 1 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 704d9609b3..134cd424c8 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -189,11 +189,12 @@ COMPILERFLAG = -Zm600
!endif
!if !defined(WARNFLAGS)
!if $(MSC_VER) >= 1400
-WARNFLAGS = -W2 -wd4996
+WARNFLAGS = -W2 -wd4996 -we4028 -we4142
!else
WARNFLAGS = -W2
!endif
!endif
+WERRORFLAG = -WX
!if !defined(CFLAGS)
CFLAGS = $(RUNTIMEFLAG) $(DEBUGFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG) $(COMPILERFLAG)
!endif
@@ -679,6 +680,7 @@ s,@SHELL@,$$(COMSPEC),;t t
s,@BUILD_FILE_SEPARATOR@,\,;t t
s,@PATH_SEPARATOR@,;,;t t
s,@CFLAGS@,$(CFLAGS),;t t
+s,@WERRORFLAG@,$(WERRORFLAG),;t t
s,@DEFS@,$(DEFS),;t t
s,@CPPFLAGS@,$(CPPFLAGS),;t t
s,@CXXFLAGS@,$(CXXFLAGS),;t t