summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2013-02-16 20:17:31 +0000
committerdim <dim@FreeBSD.org>2013-02-16 20:17:31 +0000
commitc19ac081a36f6c6906ce8651b26fa46f0db5193a (patch)
tree13990fab4f615ffbe08385aaccc606566933d392
parent1c8066ed1e89fef7ba988aec95043a4c778c3c63 (diff)
downloadFreeBSD-src-c19ac081a36f6c6906ce8651b26fa46f0db5193a.zip
FreeBSD-src-c19ac081a36f6c6906ce8651b26fa46f0db5193a.tar.gz
Since clang 3.2 now has an option to suppress warnings about implicitly
promoted K&R parameters, remove the workarounds added for sendmail components in r228558. MFC after: 1 week
-rw-r--r--lib/libsm/Makefile5
-rw-r--r--libexec/mail.local/Makefile5
-rw-r--r--libexec/smrsh/Makefile5
-rw-r--r--share/mk/bsd.sys.mk2
-rw-r--r--usr.bin/vacation/Makefile5
-rw-r--r--usr.sbin/sendmail/Makefile5
6 files changed, 1 insertions, 26 deletions
diff --git a/lib/libsm/Makefile b/lib/libsm/Makefile
index f2f19fb..ce590d7 100644
--- a/lib/libsm/Makefile
+++ b/lib/libsm/Makefile
@@ -18,11 +18,6 @@ CFLAGS+=${SENDMAIL_CFLAGS}
WARNS?= 2
-# Unfortunately, clang gives warnings about sendmail code that cannot
-# be turned off yet. Since this is contrib code, and we don't really
-# care about the warnings, just make them non-fatal for now.
-NO_WERROR.clang=
-
LIB= sm
SRCS+= sm_os.h
diff --git a/libexec/mail.local/Makefile b/libexec/mail.local/Makefile
index 1487dec..3e59609 100644
--- a/libexec/mail.local/Makefile
+++ b/libexec/mail.local/Makefile
@@ -12,11 +12,6 @@ CFLAGS+=-I${SENDMAIL_DIR}/include -I.
WARNS?= 2
WFORMAT=0
-# Unfortunately, clang gives warnings about sendmail code that cannot
-# be turned off yet. Since this is contrib code, and we don't really
-# care about the warnings, just make them non-fatal for now.
-NO_WERROR.clang=
-
LIBSMDIR= ${.OBJDIR}/../../lib/libsm
LIBSM= ${LIBSMDIR}/libsm.a
diff --git a/libexec/smrsh/Makefile b/libexec/smrsh/Makefile
index 0de820d..ae86155 100644
--- a/libexec/smrsh/Makefile
+++ b/libexec/smrsh/Makefile
@@ -17,11 +17,6 @@ LDADD= ${LIBSM}
WARNS?= 2
-# Unfortunately, clang gives warnings about sendmail code that cannot
-# be turned off yet. Since this is contrib code, and we don't really
-# care about the warnings, just make them non-fatal for now.
-NO_WERROR.clang=
-
SRCS+= sm_os.h
CLEANFILES+=sm_os.h
diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index 847e571..1d8b49d 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -72,7 +72,7 @@ CWARNFLAGS+= -Wno-tautological-compare -Wno-unused-value\
-Wno-parentheses-equality -Wno-unused-function -Wno-conversion
.endif # WARNS <= 3
.if ${WARNS} <= 2
-CWARNFLAGS+= -Wno-switch -Wno-switch-enum
+CWARNFLAGS+= -Wno-switch -Wno-switch-enum -Wno-knr-promoted-parameter
.endif # WARNS <= 2
.if ${WARNS} <= 1
CWARNFLAGS+= -Wno-parentheses
diff --git a/usr.bin/vacation/Makefile b/usr.bin/vacation/Makefile
index ad77dba..056f576 100644
--- a/usr.bin/vacation/Makefile
+++ b/usr.bin/vacation/Makefile
@@ -11,11 +11,6 @@ CFLAGS+=-D_FFR_LISTDB -D_FFR_DEBUG
WARNS?= 2
-# Unfortunately, clang gives warnings about sendmail code that cannot
-# be turned off yet. Since this is contrib code, and we don't really
-# care about the warnings, just make them non-fatal for now.
-NO_WERROR.clang=
-
LIBSMDIR= ${.OBJDIR}/../../lib/libsm
LIBSM= ${LIBSMDIR}/libsm.a
diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile
index b68ed0f..a9f7fbb 100644
--- a/usr.sbin/sendmail/Makefile
+++ b/usr.sbin/sendmail/Makefile
@@ -45,11 +45,6 @@ CFLAGS+= -DNETINET6
WARNS?= 1
-# Unfortunately, clang gives warnings about sendmail code that cannot
-# be turned off yet. Since this is contrib code, and we don't really
-# care about the warnings, just make them non-fatal for now.
-NO_WERROR.clang=
-
DPADD= ${LIBUTIL} ${LIBWRAP}
LDADD= -lutil -lwrap
OpenPOWER on IntegriCloud