diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-08-13 11:41:03 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-08-13 11:41:03 +0000 |
| commit | 881846a585dd22760b95f55003f1344df8af4198 (patch) | |
| tree | fc7962e6d5bbf17840a85f70c0c15b745bb6c315 /usr/src/cmd/svc | |
| parent | 6ea47f7a1107071503a26c8f0256b607e1ad29e9 (diff) | |
| parent | 7f3e7b1b3fd1f1ac090d298a0203b20c79fbe725 (diff) | |
| download | illumos-joyent-881846a585dd22760b95f55003f1344df8af4198.tar.gz | |
[illumos-gate merge]
commit 7f3e7b1b3fd1f1ac090d298a0203b20c79fbe725
11523 i86pc: dboot_startkern.c:2046: error: comparison between pointer and integer
commit 4f7f1d0fa878cb07e58af9d4f2abea08273b07c7
11475 gptzfsboot: update parsing the option switches
commit efe51d0cc2398b9ac179568b63a44e4bf295b8e2
11506 smatch resync
Conflicts:
usr/src/tools/smatch/Makefile
usr/src/cmd/syseventd/modules/sysevent_conf_mod/Makefile
usr/src/cmd/svc/configd/Makefile
usr/src/boot/sys/boot/libstand/Makefile.com
Diffstat (limited to 'usr/src/cmd/svc')
| -rw-r--r-- | usr/src/cmd/svc/configd/Makefile | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/usr/src/cmd/svc/configd/Makefile b/usr/src/cmd/svc/configd/Makefile index 4d74800a7f..419ca6248b 100644 --- a/usr/src/cmd/svc/configd/Makefile +++ b/usr/src/cmd/svc/configd/Makefile @@ -63,13 +63,11 @@ CERRWARN += -_gcc=-Wno-unused-variable CERRWARN += -_gcc=-Wno-unused-function CERRWARN += -_gcc=-Wno-uninitialized -# Despite the source being the same as upstream, smatch gives us a bizarre false -# positive here. +# strange false positive SMOFF += free MYLDLIBS = -lumem -luutil LDLIBS += -lsecdb -lbsm $(MYLDLIBS) -LINTFLAGS += -errtags -erroff=E_BAD_FORMAT_ARG_TYPE2 -erroff=E_NAME_DEF_NOT_USED2 CLOBBERFILES += $(MYPROG:%=%-native) @@ -132,10 +130,6 @@ clean: FRC clobber: -lint: lint_SRCS - -lint_SRCS: - include ../../Makefile.targ FRC: |