diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-06-20 11:50:48 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-06-20 11:50:48 +0000 |
| commit | 184c8efbadff7177bbb6dc1ba6b13cd9ba3c934a (patch) | |
| tree | f84d92190989d1ce4359999dbc792566791892ad /usr/src/Makefile | |
| parent | 2f7409fa41fda5d823048e31a9426049cf1fc51a (diff) | |
| parent | 192a5ca9fe8b81784c9921860f876735fc9a1e3e (diff) | |
| download | illumos-joyent-184c8efbadff7177bbb6dc1ba6b13cd9ba3c934a.tar.gz | |
[illumos-gate merge]
commit 192a5ca9fe8b81784c9921860f876735fc9a1e3e
8371 remove warlock files in usr/src/uts
commit cabd62a218e426e3dea29d3051d184458cdddbdf
8393 bnxe: left shift of negative value and bad macro
commit a17ce84520dc4e972c913e0fa1d1545ddd22b55e
8392 Do not cast the return value of xdr_free()
commit 5c25b6f10367f6cb7b3d8b8bc7e374712eb977c2
8367 remove warlock leftovers from usr/src/uts Makefiles
commit eb28af623974cfc31cb4545d2965bbaca3fb6888
8329 ldapcachemgr: misleading-indentation
8364 ldapcachemgr does not set log file in debug mode if -l was not used
commit 0d56f5df8a4bc5dd756cf0ea58ab3e0519c76032
8223 libshell: misleading-indentation
commit 7bdb5b9a077c9ce26caedc489a6a5ee9e45214ed
7876 libast: misleading-indentation errors
commit f15a6fde3c0a52aca95943ffd637d7b8220e2261
8379 illumos-gate 'install' make target is too eager building things
8360 ipdadm missing 'all' target
8359 libzpool Makefiles are slightly broken
commit 99d29265ec47e10c7ec8c18a67fc83e7dd5ce4f8
8397 sysevent.h: C++11 requires a space between literal and string macro
commit 02dc24bdf7a983da73ebfd10cc3b5627a74789c5
8410 ucoreadm links against libraries outside the proto area
commit 00bdf9afcd6a60aceb896a5b75ac0a061981ee94
8394 fcoet: array subscript is above array bounds
commit 24a150c1bcca7eba0f2d518d0f41645eb55f6066
8398 pcmcia: sizeof on array function parameter
Conflicts:
usr/src/uts/common/sys/sysevent.h
Diffstat (limited to 'usr/src/Makefile')
| -rw-r--r-- | usr/src/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/Makefile b/usr/src/Makefile index 83491a3469..a7a4f8b1fa 100644 --- a/usr/src/Makefile +++ b/usr/src/Makefile @@ -25,7 +25,7 @@ # Copyright 2014 Garrett D'Amore <garrett@damore.org> # Copyright 2015 OmniTI Computer Consulting, Inc. All rights reserved. # Copyright 2016 Toomas Soome <tsoome@me.com> -# Copyright 2016 Joyent, Inc. +# Copyright 2017 Joyent, Inc. # # @@ -123,7 +123,7 @@ stage-licenses: install2 install1: mapfiles closedbins sgs -install2: install1 $(SUBDIRS) +install2: install1 .WAIT $(SUBDIRS) _msg: _msgdirs rootdirs FRC @for m in $(MSGSUBDIRS); do \ |