Browse Source

[master] check werror_ok, not with_werror, in the Boost build failure check.

this is necessary to keep the previous behavior for FreeBSD where -Werror
is automatically disabled due to other bug of the compiler.
discussed on jabber, not seen a clear go, but I'm committing it at my
discretion to fix the buildbot errors.  I've confirmed the behavior on
multiple FreeBSD boxes.
JINMEI Tatuya 12 years ago
parent
commit
2aa422106d
1 changed files with 1 additions and 1 deletions
  1. 1 1
      configure.ac

+ 1 - 1
configure.ac

@@ -848,7 +848,7 @@ fi
 # There's a known bug in FreeBSD ports for Boost that would trigger a false
 # There's a known bug in FreeBSD ports for Boost that would trigger a false
 # warning in build with g++ and -Werror (we exclude clang++ explicitly to
 # warning in build with g++ and -Werror (we exclude clang++ explicitly to
 # avoid unexpected false positives).
 # avoid unexpected false positives).
-if test "$BOOST_NUMERIC_CAST_WOULDFAIL" = "yes" -a X"$with_werror" = X1 -a $CLANGPP = "no"; then
+if test "$BOOST_NUMERIC_CAST_WOULDFAIL" = "yes" -a X"$werror_ok" = X1 -a $CLANGPP = "no"; then
     AC_MSG_ERROR([Failed to compile a required header file.  If you are using FreeBSD and Boost installed via ports, retry with specifying --without-werror.  See the ChangeLog entry for Trac no. 1991 for more details.])
     AC_MSG_ERROR([Failed to compile a required header file.  If you are using FreeBSD and Boost installed via ports, retry with specifying --without-werror.  See the ChangeLog entry for Trac no. 1991 for more details.])
 fi
 fi