diff options
author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-02-07 14:47:15 +0000 |
---|---|---|
committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-02-07 14:47:15 +0000 |
commit | 17f38e7ef2015b72900922805a980ab277aa39df (patch) | |
tree | 252e3ce9655e901ac9d8734a4acf3e5da46b0d47 /usr/src | |
parent | a8c99d9d4ff15952a420fa9166214d2353a60ad1 (diff) | |
download | illumos-joyent-17f38e7ef2015b72900922805a980ab277aa39df.tar.gz |
9027 Makefiles need to specify C99 mode consistently [fix broken build]
Diffstat (limited to 'usr/src')
-rw-r--r-- | usr/src/cmd/zoneadmd/Makefile.com | 5 | ||||
-rw-r--r-- | usr/src/test/os-tests/tests/timer/Makefile | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/usr/src/cmd/zoneadmd/Makefile.com b/usr/src/cmd/zoneadmd/Makefile.com index bb96a96bc9..75d7d82396 100644 --- a/usr/src/cmd/zoneadmd/Makefile.com +++ b/usr/src/cmd/zoneadmd/Makefile.com @@ -20,7 +20,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. -# Copyright 2017 Joyent, Inc. +# Copyright 2018 Joyent, Inc. # PROG= zoneadmd @@ -37,8 +37,7 @@ LDLIBS += -lsocket -lzonecfg -lnsl -ldevinfo -ldevice -lnvpair \ -lgen -lbsm -lcontract -lzfs -luuid -lbrand -ldladm -ltsnet -ltsol \ -linetutil -lproc -lscf -C99MODE= -xc99=%all -C99LMODE= -Xc99=%all +CSTD= $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/test/os-tests/tests/timer/Makefile b/usr/src/test/os-tests/tests/timer/Makefile index dd85b0caf8..4c88f2465e 100644 --- a/usr/src/test/os-tests/tests/timer/Makefile +++ b/usr/src/test/os-tests/tests/timer/Makefile @@ -10,7 +10,7 @@ # # -# Copyright 2016 Joyent, Inc. +# Copyright 2018 Joyent, Inc. # include $(SRC)/Makefile.master @@ -23,7 +23,7 @@ PROGS = timer_limit include $(SRC)/cmd/Makefile.cmd include $(SRC)/test/Makefile.com -C99MODE = -xc99=%all +CSTD= $(CSTD_GNU99) CMDS = $(PROGS:%=$(TESTDIR)/%) |