diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-02-07 16:02:39 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-02-07 16:02:39 +0000 |
| commit | 160e9fdbf38459e565d0e84e0c52f3ddfba945b5 (patch) | |
| tree | 7846134133be3d71420924f21fe7c49441344514 | |
| parent | 2629cc82ee1e239547b58417ba97fc7e8d7543b7 (diff) | |
| download | illumos-joyent-160e9fdbf38459e565d0e84e0c52f3ddfba945b5.tar.gz | |
add ld assert-deflib and guidance to gate build [fix build race which fails local library validation]
| -rw-r--r-- | usr/src/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/lib/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/usr/src/Makefile b/usr/src/Makefile index 566050738b..2fce5ba301 100644 --- a/usr/src/Makefile +++ b/usr/src/Makefile @@ -191,6 +191,10 @@ $(SUBDIRS) head ucbhead pkg: FRC sgs: rootdirs .WAIT sysheaders userheaders .WAIT \ libheaders ucbheaders cmdheaders +# To prevent 'ld: warning: dynamic library found on default search path', make +# sure we've finished building all of the libraries before doing cmd and test. +test cmd: lib + # # Top-level setup target to setup the development environment that includes # headers, tools and generated mapfiles. For open-only builds (i.e.: source diff --git a/usr/src/lib/Makefile b/usr/src/lib/Makefile index 14bf04ed43..3ea7f02985 100644 --- a/usr/src/lib/Makefile +++ b/usr/src/lib/Makefile @@ -612,7 +612,7 @@ libadt_jni: libbsm libadutils: libldap5 libresolv2 libbe: libzfs libinstzones libuuid libgen libdevinfo libefi libficl libbsm: libinetutil libscf libsecdb libtsol -libbunyan: libnvpair +libbunyan: libumem libcfgadm: libdevinfo libcontract: libnvpair libcmd: libsum libast @@ -633,7 +633,7 @@ libdladm: libdevinfo libinetutil libscf librcm libexacct libkstat \ libdll: libast libdlpi: libinetutil libdladm libds: libsysevent -libdtrace: libproc libgen libctf libmapmalloc +libdtrace: libproc libgen libctf libmapmalloc libzonecfg ../cmd/sgs/libelf libdtrace_jni: libuutil libdtrace libdwarf: ../cmd/sgs/libelf libefi: libuuid libsmbios |