diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-05-22 18:52:15 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-05-22 18:52:15 +0000 |
| commit | 69a680634e04707451f839a2d6bd43a2488061cb (patch) | |
| tree | d39d157f43664466497bfd55d4ad25ad32a654ee /usr/src/cmd/ssh/ssh-keyscan | |
| parent | 23f127e3c7224d324ca5c877a91beee797e21373 (diff) | |
| parent | d00075c72fe6e0468054c64c53d70554c1d1cb02 (diff) | |
| download | illumos-joyent-69a680634e04707451f839a2d6bd43a2488061cb.tar.gz | |
[illumos-gate merge]
commit d00075c72fe6e0468054c64c53d70554c1d1cb02
4867 Uninitialized variables in libnsl
commit d7141854234c22ab8fe0547bf51a2f3a30781870
Conflicts:
usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com
usr/src/lib/libwanboot/Makefile.com
usr/src/lib/libpkg/Makefile.com
usr/src/cmd/ssh/sshd/Makefile
usr/src/cmd/ssh/ssh/Makefile
usr/src/cmd/ssh/ssh-keysign/Makefile
usr/src/cmd/ssh/ssh-keyscan/Makefile
usr/src/cmd/ssh/ssh-keygen/Makefile
usr/src/cmd/ssh/ssh-agent/Makefile
usr/src/cmd/ssh/ssh-add/Makefile
usr/src/cmd/ssh/sftp/Makefile
usr/src/cmd/ssh/sftp-server/Makefile
usr/src/cmd/cmd-inet/usr.lib/wanboot/wanboot-cgi/Makefile
usr/src/cmd/cmd-inet/usr.lib/wanboot/p12split/Makefile
Diffstat (limited to 'usr/src/cmd/ssh/ssh-keyscan')
| -rw-r--r-- | usr/src/cmd/ssh/ssh-keyscan/Makefile | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/usr/src/cmd/ssh/ssh-keyscan/Makefile b/usr/src/cmd/ssh/ssh-keyscan/Makefile index c0d53c34b7..90428880a3 100644 --- a/usr/src/cmd/ssh/ssh-keyscan/Makefile +++ b/usr/src/cmd/ssh/ssh-keyscan/Makefile @@ -32,10 +32,7 @@ SRCS = $(OBJS:.o=.c) include ../../Makefile.cmd include ../Makefile.ssh-common -LDLIBS += $(SSH_COMMON_LDLIBS) -lsocket -lnsl -lz - -# libcrypto has no lint library, so we can only use it when building -$(PROG) := LDLIBS += -lsunw_crypto +LDLIBS += $(SSH_COMMON_LDLIBS) -lsocket -lnsl -lz -lsunw_crypto POFILE_DIR= .. |