Commit 2aa42210 authored by JINMEI Tatuya's avatar JINMEI Tatuya
Browse files

[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.
parent 14220fef
......@@ -848,7 +848,7 @@ fi
# 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
# 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.])
fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment