diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-08-16 11:15:20 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-08-16 11:15:20 +0000 |
| commit | 0833839f60181af6fcf14de327d3ba2b30da8ed2 (patch) | |
| tree | af7f3254e70fb8ad910d460648f9af42c0210457 /usr/src/cmd/dispadmin | |
| parent | adf665b5e735d87cf7d6b4e8932fb7dce88e42ad (diff) | |
| parent | d3b5f56344d8bfcdd6cfb82446af0e5e55ad9ebe (diff) | |
| download | illumos-joyent-0833839f60181af6fcf14de327d3ba2b30da8ed2.tar.gz | |
[illumos-gate merge]
commit d3b5f56344d8bfcdd6cfb82446af0e5e55ad9ebe
11528 Makefile.noget can get gone
11529 Use -Wno-maybe-initialized
commit c4ccc1f9004b70b07e4cdb57641c38ab607306c9
11226 Remove NetraCT support
commit dcfeff93f67a1188722a358e0fbfcd604993e573
11561 loader script needs to place .eh_frame after .text
commit a8ffe4975d219124d53dcd9de30126f3a595d28f
11555 gptzfsboot: boot prompt is not refreshed on device change
commit 79940ff6ac581ff9431c474dcfa18c78f1cb7a50
11556 ip_attr.c functions need to not dereference conn_ixa directly after lock drop
commit fe949611d4f0a0f42a6923a31cd3073e5b2bc97c
10540 wsdiff much slower under python3 than python2
commit c1064fd7ce62fe763a4475e9988ffea3b22137de
11541 allocation_classes feature must be enabled to add log device
Conflicts:
usr/src/uts/sparc/Makefile.sparc
usr/src/uts/intel/dev/Makefile
usr/src/uts/i86pc/pcie/Makefile
usr/src/cmd/zoneadmd/Makefile
Diffstat (limited to 'usr/src/cmd/dispadmin')
| -rw-r--r-- | usr/src/cmd/dispadmin/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/cmd/dispadmin/Makefile b/usr/src/cmd/dispadmin/Makefile index 6df5bbca3f..93e4ab653d 100644 --- a/usr/src/cmd/dispadmin/Makefile +++ b/usr/src/cmd/dispadmin/Makefile @@ -43,7 +43,7 @@ ROOTETCFILES= $(ETCFILES:%=$(ROOTETC)/%) include ../Makefile.cmd CFLAGS += $(CCVERBOSE) -CERRWARN += -_gcc=-Wno-uninitialized +CERRWARN += $(CNOWARN_UNINIT) ROOTDIR= $(ROOT)/usr/lib/class ROOTDIRS= $(ROOTDIR) \ |