diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-09-21 12:55:16 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-09-21 12:55:16 +0000 |
| commit | a6d19fc7e119bb7bcc8a1c0a9ad179bb6ab49f6f (patch) | |
| tree | 27b0764170caed40af2e414af1ca0e90b5fc3cda | |
| parent | 05ed19bee13b8ee8bcfdab7554f4337984f83880 (diff) | |
| download | illumos-joyent-a6d19fc7e119bb7bcc8a1c0a9ad179bb6ab49f6f.tar.gz | |
6117 Many small bugs prevent a clean build on SPARC [fix merge issue]
| -rw-r--r-- | usr/src/lib/Makefile | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/usr/src/lib/Makefile b/usr/src/lib/Makefile index 38ee2fd96b..c27abf0246 100644 --- a/usr/src/lib/Makefile +++ b/usr/src/lib/Makefile @@ -648,13 +648,10 @@ librestart: libuutil libscf libpool libproject libsecdb libnvpair libsaveargs: libdisasm ../cmd/sgs/libdl: ../cmd/sgs/libconv ../cmd/sgs/libelf: ../cmd/sgs/libconv -<<<<<<< HEAD -======= passwdutil: libsldap pkcs11: libcryptoutil libmd # Adding libuuid or libdladm results in a circular dependancy print: libldap5 ->>>>>>> FETCH_HEAD udapl/udapl_tavor: udapl/libdat libzfs: libdevid libgen libnvpair libuutil \ libadm libavl libefi libidmap libmd libzfs_core libm |