build: compile with -Werror by default on Darwin

Using -Werror has been disabled for Darwin since very early on in the
codebase. However at this point, I can't see an obvious reason why it
should still be disabled compared to when building for the other
operating systems.

I've tested compiling on macOS using Apple Clang 11.0.3, LLVM Clang
10.0.0 and GCC 10.1.
This commit is contained in:
fanquake 2020-07-21 09:26:10 +08:00
parent 571045d129
commit 3a7b77d5f6
No known key found for this signature in database
GPG Key ID: 2EEB9F5CC09526C1

View File

@ -196,7 +196,7 @@ else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
# By default compiling with -Werror except OSX and on Solaris when building # By default compiling with -Werror except on OSX and Solaris when building
# with libsodium. # with libsodium.
AC_ARG_ENABLE([Werror], AC_ARG_ENABLE([Werror],
[AS_HELP_STRING([--disable-Werror], [disable Werror compiler flag [default=enabled]])], [AS_HELP_STRING([--disable-Werror], [disable Werror compiler flag [default=enabled]])],
@ -278,7 +278,6 @@ case "${host_os}" in
# Define on Darwin to enable all library features # Define on Darwin to enable all library features
CPPFLAGS="-D_DARWIN_C_SOURCE $CPPFLAGS" CPPFLAGS="-D_DARWIN_C_SOURCE $CPPFLAGS"
libzmq_pedantic="no" libzmq_pedantic="no"
libzmq_werror="no"
AC_DEFINE(ZMQ_HAVE_OSX, 1, [Have DarwinOSX OS]) AC_DEFINE(ZMQ_HAVE_OSX, 1, [Have DarwinOSX OS])
;; ;;
*haiku*) *haiku*)
@ -560,13 +559,18 @@ elif test "x$with_libsodium" = "xyes"; then
curve_library="libsodium" curve_library="libsodium"
enable_curve="yes" enable_curve="yes"
# On Solaris, libsodium depends on libssp
case "${host_os}" in case "${host_os}" in
*solaris*) *solaris*)
dnl On Solaris, libsodium depends on libssp
LDFLAGS="-lssp $LDFLAGS" LDFLAGS="-lssp $LDFLAGS"
libzmq_pedantic="no" libzmq_pedantic="no"
libzmq_werror="no" libzmq_werror="no"
;; ;;
*darwin*)
dnl On Darwin, building with libsodium causes
dnl macro redefinition warnings
libzmq_werror="no"
;;
esac esac
PKGCFG_NAMES_PRIVATE="$PKGCFG_NAMES_PRIVATE libsodium" PKGCFG_NAMES_PRIVATE="$PKGCFG_NAMES_PRIVATE libsodium"