From 484e94a89c84cea432e4aad8ec365632ea913365 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 31 Dec 2010 02:46:50 +0000
Subject: * configure.in (warnflags), lib/mkmf.rb (configuration): turn  
 warnings into errors only for bundled extensions.   [ruby-core:33815]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30438 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog    |  6 ++++++
 configure.in | 19 ++++++++++++++++---
 lib/mkmf.rb  |  6 +++++-
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 72b827a337..2985c709f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Dec 31 11:46:47 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (warnflags), lib/mkmf.rb (configuration): turn
+	  warnings into errors only for bundled extensions.
+	  [ruby-core:33815]
+
 Fri Dec 31 11:15:57 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/zlib/zlib.c (sizeof): zlib.h mistakenly assumes the result
diff --git a/configure.in b/configure.in
index 3a1999c78c..d91abf98fa 100644
--- a/configure.in
+++ b/configure.in
@@ -444,10 +444,23 @@ AC_DEFUN(RUBY_TRY_LDFLAGS, [
 ])
 
 if test "$GCC:${warnflags+set}:no" = yes::no; then
-    for wflag in -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings \
+    particular_werror_flags=yes
+    for wflag in -Wno-unused-parameter -Wno-parentheses -Wno-long-long \
+		 -Wno-missing-field-initializers \
+		 -Werror=pointer-arith \
+		 -Werror=write-strings \
 		 -Werror=declaration-after-statement \
-		 -Wno-missing-field-initializers -Wshorten-64-to-32 -Wno-long-long; do
-	RUBY_TRY_CFLAGS($wflag, [warnflags="${warnflags+$warnflags }$wflag"])
+		 -Werror=shorten-64-to-32; do
+	test "$particular_werror_flags" = yes || wflag=`echo x$wflag | sed 's/^x-Werror=/-W/'`
+	ok=no
+	RUBY_TRY_CFLAGS($wflag, [warnflags="${warnflags+$warnflags }$wflag" ok=yes])
+	AS_CASE([$ok:$wflag], [no:-Werror=*], [
+	    wflag=`echo x$wflag | sed 's/^x-Werror=/-W/'`
+	    RUBY_TRY_CFLAGS($wflag, [
+		warnflags="${warnflags+$warnflags }$wflag"
+		particular_werror_flags=no
+	    ])
+	])
     done
     AS_CASE([" $warnflags "],[*" -Wno-missing-field-initializers "*], [wflag=-Wextra],
                              [wflag=-Wall])
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index c25270dbc6..d7964d61cb 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1658,6 +1658,10 @@ VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
   end
   possible_command = (proc {|s| s if /top_srcdir/ !~ s} unless $extmk)
   extconf_h = $extconf_h ? "-DRUBY_EXTCONF_H=\\\"$(RUBY_EXTCONF_H)\\\" " : $defs.join(" ") << " "
+  if warnflags = CONFIG['warnflags'] and CONFIG['GCC'] == 'yes' and !$extmk
+    # turn warnings into errors only for bundled extensions.
+    warnflags = warnflags.gsub(/(?:\A|\s)-Werror=/, '\1-W')
+  end
   mk << %{
 CC = #{CONFIG['CC']}
 CXX = #{CONFIG['CXX']}
@@ -1672,7 +1676,7 @@ RUBY_EXTCONF_H = #{$extconf_h}
 cflags   = #{CONFIG['cflags']}
 optflags = #{CONFIG['optflags']}
 debugflags = #{CONFIG['debugflags']}
-warnflags = #{CONFIG['warnflags']}
+warnflags = #{warnflags}
 CFLAGS   = #{$static ? '' : CONFIG['CCDLFLAGS']} #$CFLAGS #$ARCH_FLAG
 INCFLAGS = -I. #$INCFLAGS
 DEFS     = #{CONFIG['DEFS']}
-- 
cgit v1.2.3