Use positive checks for GCC 4.1. Deal with missing HAVE_GCC.
This commit is contained in:
parent
d1118a5e47
commit
16af9e03ea
|
@ -1,4 +1,4 @@
|
||||||
# $NetBSD: Makefile,v 1.12 2014/12/23 20:19:08 christos Exp $
|
# $NetBSD: Makefile,v 1.13 2014/12/23 20:26:30 joerg Exp $
|
||||||
|
|
||||||
LIBISPRIVATE=yes
|
LIBISPRIVATE=yes
|
||||||
|
|
||||||
|
@ -44,7 +44,7 @@ SRCS= assertions.c \
|
||||||
time.c \
|
time.c \
|
||||||
sockaddr.c
|
sockaddr.c
|
||||||
|
|
||||||
.if ${HAVE_GCC} != 4
|
.if ${HAVE_GCC:U} != 4
|
||||||
COPTS.log.c+= -Wno-error=format-nonliteral
|
COPTS.log.c+= -Wno-error=format-nonliteral
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# $NetBSD: Makefile,v 1.16 2014/12/23 20:19:08 christos Exp $
|
# $NetBSD: Makefile,v 1.17 2014/12/23 20:26:30 joerg Exp $
|
||||||
|
|
||||||
LIBISPRIVATE=yes
|
LIBISPRIVATE=yes
|
||||||
|
|
||||||
|
@ -79,10 +79,10 @@ ymd2yd.c
|
||||||
|
|
||||||
CPPFLAGS+= -I${IDIST}/sntp/libopts
|
CPPFLAGS+= -I${IDIST}/sntp/libopts
|
||||||
|
|
||||||
.if ${HAVE_GCC} != 4
|
.if ${HAVE_GCC:U} == 4
|
||||||
COPTS.msyslog.c+= -Wno-error=format-nonliteral
|
|
||||||
.else
|
|
||||||
COPTS.systime.c+= -Wno-uninitialized
|
COPTS.systime.c+= -Wno-uninitialized
|
||||||
|
.else
|
||||||
|
COPTS.msyslog.c+= -Wno-error=format-nonliteral
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
# For MKREPRO, avoid using __DATE__ and __TIME__.
|
# For MKREPRO, avoid using __DATE__ and __TIME__.
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# $NetBSD: Makefile,v 1.12 2014/12/23 20:19:08 christos Exp $
|
# $NetBSD: Makefile,v 1.13 2014/12/23 20:26:30 joerg Exp $
|
||||||
|
|
||||||
LIBISPRIVATE=yes
|
LIBISPRIVATE=yes
|
||||||
|
|
||||||
|
@ -17,10 +17,10 @@ CPPFLAGS+=-I${DIST}
|
||||||
SRCS=libopts.c
|
SRCS=libopts.c
|
||||||
|
|
||||||
COPTS.libopts.c += -DPOSIX_SHELL="\"/bin/sh\"" -Wno-format-nonliteral
|
COPTS.libopts.c += -DPOSIX_SHELL="\"/bin/sh\"" -Wno-format-nonliteral
|
||||||
.if ${HAVE_GCC} != 4
|
.if ${HAVE_GCC:U} == 4
|
||||||
COPTS.libopts.c+= ${${ACTIVE_CC} == "gcc":? -Wno-format-contains-nul :}
|
|
||||||
.else
|
|
||||||
COPTS.libopts.c+= -Wno-error
|
COPTS.libopts.c+= -Wno-error
|
||||||
|
.else
|
||||||
|
COPTS.libopts.c+= ${${ACTIVE_CC} == "gcc":? -Wno-format-contains-nul :}
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.include <bsd.lib.mk>
|
.include <bsd.lib.mk>
|
||||||
|
|
Loading…
Reference in New Issue