Wed Jun 6 14:31:45 2018 UTC ()
Make cddl/osnet/usr.sbin/dtrace -W compatible with MKLLVM=yes

Clang/LLVM does not recognize:
 - -Wno-discarded-qualifiers
 - -Wno-unused-but-set-variable

This is a step forward functional MKLLVM=yes HAVE_LLVM=yes build.

Sponsored by <The NetBSD Foundation>


(kamil)
diff -r1.10 -r1.11 src/external/cddl/osnet/usr.sbin/dtrace/Makefile
cvs diff -r1.10 -r1.11 src/external/cddl/osnet/usr.sbin/dtrace/Makefile (expand / switch to unified diff)

--- src/external/cddl/osnet/usr.sbin/dtrace/Makefile 2018/05/28 21:05:11 1.10
+++ src/external/cddl/osnet/usr.sbin/dtrace/Makefile 2018/06/06 14:31:45 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.10 2018/05/28 21:05:11 chs Exp $ 1# $NetBSD: Makefile,v 1.11 2018/06/06 14:31:45 kamil Exp $
2 2
3# $FreeBSD: head/cddl/usr.sbin/dtrace/Makefile 314654 2017-03-04 11:30:04Z ngie $ 3# $FreeBSD: head/cddl/usr.sbin/dtrace/Makefile 314654 2017-03-04 11:30:04Z ngie $
4 4
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6.include "../../Makefile.inc" 6.include "../../Makefile.inc"
7 7
8PROG= dtrace 8PROG= dtrace
9MAN= dtrace.1 9MAN= dtrace.1
10 10
11BINDIR?= /usr/sbin 11BINDIR?= /usr/sbin
12 12
13SRCS= dtrace.c 13SRCS= dtrace.c
14 14
@@ -22,28 +22,30 @@ CFLAGS+= -I${OSNETDIR}/sys \ @@ -22,28 +22,30 @@ CFLAGS+= -I${OSNETDIR}/sys \
22 -I${OPENSOLARIS_SYS_DISTDIR}/uts/common \ 22 -I${OPENSOLARIS_SYS_DISTDIR}/uts/common \
23 -I${OPENSOLARIS_SYS_DISTDIR}/compat \ 23 -I${OPENSOLARIS_SYS_DISTDIR}/compat \
24 24
25.PATH: ${OPENSOLARIS_USR_DISTDIR}/cmd/dtrace 25.PATH: ${OPENSOLARIS_USR_DISTDIR}/cmd/dtrace
26 26
27# Optional debugging stuff... 27# Optional debugging stuff...
28#CFLAGS+= -DNEED_ERRLOC 28#CFLAGS+= -DNEED_ERRLOC
29#YFLAGS+= -d 29#YFLAGS+= -d
30 30
31COPTS.dtrace.c += -Wno-stack-protector 31COPTS.dtrace.c += -Wno-stack-protector
32COPTS.dtrace.c += -Wno-format-extra-args 32COPTS.dtrace.c += -Wno-format-extra-args
33 33
34COPTS.dtrace.c += -Wno-shadow 34COPTS.dtrace.c += -Wno-shadow
 35.if defined(HAVE_GCC)
35COPTS.dtrace.c += -Wno-discarded-qualifiers 36COPTS.dtrace.c += -Wno-discarded-qualifiers
36COPTS.dtrace.c += -Wno-missing-field-initializers 
37COPTS.dtrace.c += -Wno-unused-but-set-variable 37COPTS.dtrace.c += -Wno-unused-but-set-variable
 38.endif
 39COPTS.dtrace.c += -Wno-missing-field-initializers
38COPTS.dtrace.c += -Wno-format 40COPTS.dtrace.c += -Wno-format
39 41
40LDFLAGS+= -pthread 42LDFLAGS+= -pthread
41 43
42PROGDPLIBS+= ctf ${.CURDIR}/../../lib/libctf 44PROGDPLIBS+= ctf ${.CURDIR}/../../lib/libctf
43PROGDPLIBS+= dtrace ${.CURDIR}/../../lib/libdtrace 45PROGDPLIBS+= dtrace ${.CURDIR}/../../lib/libdtrace
44PROGDPLIBS+= elf ${NETBSDSRCDIR}/external/bsd/elftoolchain/lib/libelf 46PROGDPLIBS+= elf ${NETBSDSRCDIR}/external/bsd/elftoolchain/lib/libelf
45PROGDPLIBS+= y ${NETBSDSRCDIR}/lib/liby 47PROGDPLIBS+= y ${NETBSDSRCDIR}/lib/liby
46PROGDPLIBS+= l ${NETBSDSRCDIR}/external/bsd/flex/lib 48PROGDPLIBS+= l ${NETBSDSRCDIR}/external/bsd/flex/lib
47PROGDPLIBS+= z ${NETBSDSRCDIR}/lib/libz 49PROGDPLIBS+= z ${NETBSDSRCDIR}/lib/libz
48 50
49.include <bsd.prog.mk> 51.include <bsd.prog.mk>