diff options
| author |   espie <espie@openbsd.org> | 2001-07-18 13:23:03 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2001-07-18 13:23:03 +0000 |
| commit | b05dcccaf3599c7a50f7779b74d21ba1f91a6556 (patch) | |
| tree | a2f13e6c66c21b3d789ea3bc2db666e70fcac260 | |
| parent | avoid using malloc() during interupt context for multicast kludge entry. (diff) | |
| download | wireguard-openbsd-b05dcccaf3599c7a50f7779b74d21ba1f91a6556.tar.xz wireguard-openbsd-b05dcccaf3599c7a50f7779b74d21ba1f91a6556.zip | |
CDIAGFLAGS, added to CFLAGS if WARNINGS=Yes
Symetrize C++ situation: add CXXOPTS, CXXDIAGFLAGS.
| -rw-r--r-- | share/mk/bsd.lib.mk | 7 | ||||
| -rw-r--r-- | share/mk/bsd.lkm.mk | 5 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 4 | ||||
| -rw-r--r-- | share/mk/bsd.prog.mk | 7 |
4 files changed, 19 insertions, 4 deletions
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 42b0b641a01..447e695f8ce 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.lib.mk,v 1.29 2001/05/05 17:44:49 espie Exp $ +# $OpenBSD: bsd.lib.mk,v 1.30 2001/07/18 13:23:03 espie Exp $ # $NetBSD: bsd.lib.mk,v 1.67 1996/01/17 20:39:26 mycroft Exp $ # @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 @@ -104,7 +104,12 @@ SHLIB_MINOR != . ${.CURDIR}/shlib_version ; echo $$minor @${LD} -x -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o +.if ${WARNINGS:L} == "yes" +CFLAGS+= ${CDIAGFLAGS} +CXXFLAGS+= ${CXXDIAGFLAGS} +.endif CFLAGS+= ${COPTS} +CXXFLAGS+= ${CXXOPTS} .if !defined(PICFLAG) && (${MACHINE_ARCH} != "mips") PICFLAG=-fpic diff --git a/share/mk/bsd.lkm.mk b/share/mk/bsd.lkm.mk index 036bb97f356..b2f97094b6b 100644 --- a/share/mk/bsd.lkm.mk +++ b/share/mk/bsd.lkm.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.lkm.mk,v 1.16 2001/04/03 23:00:09 espie Exp $ +# $OpenBSD: bsd.lkm.mk,v 1.17 2001/07/18 13:23:03 espie Exp $ .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" @@ -16,6 +16,9 @@ CFLAGS+= ${COPTS} -D_KERNEL -D_LKM -I${BSDSRCDIR}/sys -I${BSDSRCDIR}/sys/arch .else CFLAGS+= ${COPTS} -D_KERNEL -D_LKM -I/sys -I/sys/arch .endif +.if ${WARNINGS:L} == "yes" +CFLAGS+= ${CDIAGFLAGS} +.endif LDFLAGS+= -r .if defined(LKM) diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index d8539face36..5583f89541a 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.own.mk,v 1.50 2001/06/27 18:09:26 drahn Exp $ +# $OpenBSD: bsd.own.mk,v 1.51 2001/07/18 13:23:03 espie Exp $ # $NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $ # Host-specific overrides @@ -8,6 +8,8 @@ .include "/etc/mk.conf" .endif +# Set `WARNINGS' to `yes' to add appropriate warnings to each compilation +WARNINGS?= no # Set `SKEY' to `yes' to build with support for S/key authentication. SKEY?= yes # Set `KERBEROS' to `yes' to build with support for Kerberos authentication. diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index dfc5a79bd00..7ceb75684bc 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.prog.mk,v 1.23 2001/01/31 06:41:18 art Exp $ +# $OpenBSD: bsd.prog.mk,v 1.24 2001/07/18 13:23:03 espie Exp $ # $NetBSD: bsd.prog.mk,v 1.55 1996/04/08 21:19:26 jtc Exp $ # @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 @@ -10,7 +10,12 @@ .SUFFIXES: .out .o .c .cc .C .cxx .y .l .s .8 .7 .6 .5 .4 .3 .2 .1 .0 +.if ${WARNINGS:L} == "yes" +CFLAGS+= ${CDIAGFLAGS} +CXXFLAGS+= ${CXXDIAGFLAGS} +.endif CFLAGS+= ${COPTS} +CXXFLAGS+= ${CXXOPTS} .if (${MACHINE_ARCH} == "powerpc") || (${MACHINE_ARCH} == "alpha") CRTBEGIN?= ${DESTDIR}/usr/lib/crtbegin.o |