OS-6970 illumos-joyent specific things should use CSTD (WIP)OS-6970

11 files changed, 12 insertions, 23 deletions

diff --git a/usr/src/cmd/bhyve/test/Makefile.com b/usr/src/cmd/bhyve/test/Makefile.com
index aeba956e12..8fcfe230b7 100644
--- a/usr/src/cmd/bhyve/test/Makefile.com
+++ b/usr/src/cmd/bhyve/test/Makefile.com
@@ -21,7 +21,6 @@ include $(SRC)/cmd/Makefile.cmd.64
 # Force c99 for everything
 #
 CSTD=		$(CSTD_GNU99)
-C99MODE=	-xc99=%all
 
 CFLAGS +=	$(CCVERBOSE) -_gcc=-Wimplicit-function-declaration \
 		-_gcc=-Wno-parentheses
diff --git a/usr/src/cmd/varpd/Makefile b/usr/src/cmd/varpd/Makefile
index ea37ac6f71..5fc06ad407 100644
--- a/usr/src/cmd/varpd/Makefile
+++ b/usr/src/cmd/varpd/Makefile
@@ -37,8 +37,7 @@ $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
 #
 LINTFLAGS += -erroff=E_NAME_DEF_NOT_USED2
 
-C99MODE=	-xc99=%all
-C99LMODE=	-Xc99=%all
+CSTD=		$(CSTD_GNU99)
 
 .KEEP_STATE:
 
diff --git a/usr/src/cmd/vndadm/Makefile b/usr/src/cmd/vndadm/Makefile
index 2b9ca6c3c1..882372cec9 100644
--- a/usr/src/cmd/vndadm/Makefile
+++ b/usr/src/cmd/vndadm/Makefile
@@ -25,8 +25,7 @@ CLEANFILES += $(OBJS)
 CFLAGS += $(CCVERBOSE)
 LDLIBS += -lvnd
 LINTFLAGS += -xerroff=E_NAME_DEF_NOT_USED2
-C99MODE=	-xc99=%all
-C99LMODE=	-Xc99=%all
+CSTD=		$(CSTD_GNU99)
 
 all	:= TARGET += all
 clean	:= TARGET += clean
diff --git a/usr/src/cmd/vndadm/test/Makefile.com b/usr/src/cmd/vndadm/test/Makefile.com
index cb096952ca..d47d942c3f 100644
--- a/usr/src/cmd/vndadm/test/Makefile.com
+++ b/usr/src/cmd/vndadm/test/Makefile.com
@@ -10,7 +10,7 @@
 #
 
 #
-# Copyright (c) 2014 Joyent, Inc.  All rights reserved.
+# Copyright (c) 2018 Joyent, Inc.
 #
 
 include $(SRC)/Makefile.master
@@ -19,8 +19,7 @@ include $(SRC)/cmd/Makefile.cmd
 #
 # Force c99 for everything
 #
-C99MODE=	-xc99=%all
-C99LMODE=	-Xc99=%all
+CSTD=		$(CSTD_GNU99)
 
 #
 # Deal with odd lint bits.
diff --git a/usr/src/lib/brand/lx/lx_brand/Makefile.com b/usr/src/lib/brand/lx/lx_brand/Makefile.com
index dd457ab2ae..7a72fb25aa 100644
--- a/usr/src/lib/brand/lx/lx_brand/Makefile.com
+++ b/usr/src/lib/brand/lx/lx_brand/Makefile.com
@@ -82,15 +82,12 @@ ZGUIDANCE =	-Wl,-zguidance=nounused
 # not linted
 SMATCH=off
 
-C99MODE=	-xc99=%all
-C99LMODE=	-Xc99=%all
+CSTD=		$(CSTD_GNU99)
 
 .KEEP_STATE:
 
 all: $(LIBS)
 
-lint: lintcheck
-
 include ../../../../Makefile.targ
 include ../../../../Makefile.usdt
 
diff --git a/usr/src/lib/libdladm/Makefile.com b/usr/src/lib/libdladm/Makefile.com
index 19db4ccace..8915200969 100644
--- a/usr/src/lib/libdladm/Makefile.com
+++ b/usr/src/lib/libdladm/Makefile.com
@@ -51,6 +51,7 @@ CPPFLAGS +=	-I$(SRCDIR) -D_REENTRANT
 
 # not linted
 SMATCH=off
+CSTD=		$(CSTD_GNU99)
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/libvnd/Makefile.com b/usr/src/lib/libvnd/Makefile.com
index c567a9b942..0510de73fe 100644
--- a/usr/src/lib/libvnd/Makefile.com
+++ b/usr/src/lib/libvnd/Makefile.com
@@ -30,8 +30,7 @@ SMOFF +=	free
 
 SRCDIR =	../common
 
-C99MODE=	-xc99=%all
-C99LMODE=	-Xc99=%all
+CSTD=		$(CSTD_GNU99)
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/varpd/direct/Makefile.com b/usr/src/lib/varpd/direct/Makefile.com
index c9baf53cd4..a9da629e93 100644
--- a/usr/src/lib/varpd/direct/Makefile.com
+++ b/usr/src/lib/varpd/direct/Makefile.com
@@ -24,8 +24,7 @@ LIBS =		$(DYNLIB)
 LDLIBS +=	-lc -lumem -lnvpair
 CPPFLAGS +=	-I../common
 
-C99MODE=	-xc99=%all
-C99LMODE=	-Xc99=%all
+CSTD=		$(CSTD_GNU99)
 
 SRCDIR =	../common
 
diff --git a/usr/src/lib/varpd/files/Makefile.com b/usr/src/lib/varpd/files/Makefile.com
index dd8009d002..0ee25ae882 100644
--- a/usr/src/lib/varpd/files/Makefile.com
+++ b/usr/src/lib/varpd/files/Makefile.com
@@ -28,8 +28,7 @@ CPPFLAGS +=	-I../common
 LINTFLAGS +=	-erroff=E_BAD_PTR_CAST_ALIGN
 LINTFLAGS64 +=	-erroff=E_BAD_PTR_CAST_ALIGN
 
-C99MODE=	-xc99=%all
-C99LMODE=	-Xc99=%all
+CSTD=		$(CSTD_GNU99)
 
 SRCDIR =	../common
 
diff --git a/usr/src/lib/varpd/libvarpd/Makefile.com b/usr/src/lib/varpd/libvarpd/Makefile.com
index 1521f83f8f..dc112ac836 100644
--- a/usr/src/lib/varpd/libvarpd/Makefile.com
+++ b/usr/src/lib/varpd/libvarpd/Makefile.com
@@ -10,7 +10,7 @@
 #
 
 #
-# Copyright 2015 Joyent, Inc.
+# Copyright 2018 Joyent, Inc.
 #
 
 LIBRARY =	libvarpd.a
@@ -39,8 +39,7 @@ LINTFLAGS +=	-erroff=E_STRUCT_DERIVED_FROM_FLEX_MBR \
 LINTFLAGS64  +=	-erroff=E_STRUCT_DERIVED_FROM_FLEX_MBR \
 		-erroff=E_BAD_PTR_CAST_ALIGN
 
-C99MODE=	-xc99=%all
-C99LMODE=	-Xc99=%all
+CSTD=		$(CSTD_GNU99)
 
 SRCDIR =	../common
 
diff --git a/usr/src/lib/varpd/svp/Makefile.com b/usr/src/lib/varpd/svp/Makefile.com
index d5e6d73144..4378c4854d 100644
--- a/usr/src/lib/varpd/svp/Makefile.com
+++ b/usr/src/lib/varpd/svp/Makefile.com
@@ -42,8 +42,7 @@ LINTFLAGS +=	-erroff=E_BAD_PTR_CAST_ALIGN
 LINTFLAGS64 +=	-erroff=E_BAD_PTR_CAST_ALIGN
 SRCDIR =	../common
 
-C99MODE=	-xc99=%all
-C99LMODE=	-Xc99=%all
+CSTD=		$(CSTD_GNU99)
 
 .KEEP_STATE: