Skip to content

Commit ed21b8c

Browse files
Jason KingToomas Soome
authored andcommitted
OS-6970 illumos-joyent specific things should use CSTD
1 parent 19cead1 commit ed21b8c

File tree

5 files changed

+6
-15
lines changed

5 files changed

+6
-15
lines changed

usr/src/cmd/vndadm/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ CLEANFILES += $(OBJS)
2525
CFLAGS += $(CCVERBOSE)
2626
LDLIBS += -lvnd
2727
LINTFLAGS += -xerroff=E_NAME_DEF_NOT_USED2
28-
C99MODE= -xc99=%all
29-
C99LMODE= -Xc99=%all
28+
CSTD= $(CSTD_GNU99)
3029

3130
all := TARGET += all
3231
clean := TARGET += clean

usr/src/cmd/vndadm/test/Makefile.com

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#
1111

1212
#
13-
# Copyright (c) 2014 Joyent, Inc. All rights reserved.
13+
# Copyright (c) 2018 Joyent, Inc.
1414
#
1515

1616
include $(SRC)/Makefile.master
@@ -19,8 +19,7 @@ include $(SRC)/cmd/Makefile.cmd
1919
#
2020
# Force c99 for everything
2121
#
22-
C99MODE= -xc99=%all
23-
C99LMODE= -Xc99=%all
22+
CSTD= $(CSTD_GNU99)
2423

2524
#
2625
# Deal with odd lint bits.

usr/src/lib/brand/lx/lx_brand/Makefile.com

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,12 @@ ZGUIDANCE = -Wl,-zguidance=nounused
8484
# not linted
8585
SMATCH=off
8686

87-
C99MODE= -xc99=%all
88-
C99LMODE= -Xc99=%all
87+
CSTD= $(CSTD_GNU99)
8988

9089
.KEEP_STATE:
9190

9291
all: $(LIBS)
9392

94-
lint: lintcheck
95-
9693
include ../../../../Makefile.targ
9794
include ../../../../Makefile.usdt
9895

usr/src/lib/libvnd/Makefile.com

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ SMOFF += free
3030

3131
SRCDIR = ../common
3232

33-
C99MODE= -xc99=%all
34-
C99LMODE= -Xc99=%all
33+
CSTD= $(CSTD_GNU99)
3534

3635
.KEEP_STATE:
3736

usr/src/lib/varpd/svp/Makefile.com

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,9 @@ LDLIBS += -lc -lumem -lnvpair -lsocket -lavl \
3838
-lcmdutils -lidspace -lbunyan
3939
CPPFLAGS += -I../common
4040

41-
LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN
42-
LINTFLAGS64 += -erroff=E_BAD_PTR_CAST_ALIGN
4341
SRCDIR = ../common
4442

45-
C99MODE= -xc99=%all
46-
C99LMODE= -Xc99=%all
43+
CSTD= $(CSTD_GNU99)
4744

4845
.KEEP_STATE:
4946

0 commit comments

Comments
 (0)