Module Name: src
Committed By: apb
Date: Tue Mar 5 13:42:05 UTC 2013
Modified Files:
src/usr.sbin/zic: Makefile
Log Message:
A different way of dealing with a warning from gcc-4.1 when compiling
zic.c. Instead of setting WARNS=0 and NOGCCERROR=1, just add -Wno-error
to COPTS.zic.c when using an old version of gcc.
Also include bsd.own.mk earlier.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/zic/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/zic/Makefile
diff -u src/usr.sbin/zic/Makefile:1.12 src/usr.sbin/zic/Makefile:1.13
--- src/usr.sbin/zic/Makefile:1.12 Tue Mar 5 10:19:58 2013
+++ src/usr.sbin/zic/Makefile Tue Mar 5 13:42:04 2013
@@ -1,19 +1,18 @@
-# $NetBSD: Makefile,v 1.12 2013/03/05 10:19:58 martin Exp $
+# $NetBSD: Makefile,v 1.13 2013/03/05 13:42:04 apb Exp $
.include "Makefile.inc"
+.include <bsd.own.mk>
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 45
COPTS.zic.c += -Wno-format-nonliteral
COPTS.scheck.c += -Wno-format-nonliteral
-.else
-# warning with older gcc:
-# "comparison is always false due to limited range of data type"
-# and no way to make it shut up?
-WARNS= 0
-NOGCCERROR= 1
-.endif
-.include <bsd.own.mk>
+.if defined(HAVE_GCC) && ${HAVE_GCC} < 45
+# gcc-4.1 says:
+# "warning: comparison is always false due to limited range of data type"
+# and there is no -Wno-foo option to suppress that warning.
+#
+COPTS.zic.c+= ${${ACTIVE_CC} == "gcc" :? -Wno-error :}
+.endif # HAVE_GCC < 45
PROG= zic
SRCS= zic.c scheck.c ialloc.c
