summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-01-21 09:15:30 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-01-21 09:15:30 +0000
commit85f8c01a6d4763c4ba5a929fcbd087d244c14591 (patch)
treebf506e16f5ce069cb6134e719acab1564953625f
parent89bd00d804dd74451cf9e0d3bf528c1dd26d8854 (diff)
* configure.in: should not use -Werror=* flags while conftests.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30621 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--configure.in3
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4f8d967ef7..af48f053d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jan 21 18:15:09 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in: should not use -Werror=* flags while conftests.
+
Fri Jan 21 09:17:00 2011 Luis Lavena <luislavena@gmail.com>
* configure.in: Fix incorrectly detected x86_64-w64-mingw32 due
diff --git a/configure.in b/configure.in
index ab3436ddd1..795d7f1bcf 100644
--- a/configure.in
+++ b/configure.in
@@ -469,6 +469,8 @@ if test "$GCC:${warnflags+set}:no" = yes::no; then
AS_CASE([" $warnflags "],[*" -Wno-missing-field-initializers "*], [wflag=-Wextra],
[wflag=-Wall])
RUBY_TRY_CFLAGS($wflag, [warnflags="$wflag${warnflags+ $warnflags}"])
+ rb_cv_warnflags="$warnflags"
+ warnflags=
fi
if test "$GCC" = yes; then
RUBY_TRY_CFLAGS(-fvisibility=hidden, [RUBY_APPEND_OPTION(XCFLAGS, -fvisibility=hidden)])
@@ -2579,6 +2581,7 @@ if test "${ARCH_FLAG}"; then
CXXFLAGS=`echo "$CXXFLAGS" | sed "s|$archflagpat"'|$(ARCH_FLAG)|'`
LDFLAGS=`echo "$LDFLAGS" | sed "s|$archflagpat"'|$(ARCH_FLAG)|'`
fi
+warnflags="$rb_cv_warnflags"
AC_SUBST(cppflags, [])dnl
AC_SUBST(cflags, ["$orig_cflags "'${optflags} ${debugflags} ${warnflags}'])dnl
AC_SUBST(cxxflags, ["$orig_cxxflags "'${optflags} ${debugflags} ${warnflags}'])dnl