rescue: Fix link order of SSL libraries and fetch.
ld.bfd requires libraries to be linked in order. libssl requires
libcrypto. libfetch requires libssl. To fix the latter, move fetch
up above tar rather than listing the ssl libraries twice.
Reviewed by: delphij
Fixes: ea34aa4780 rescue: Add fetch(1) to the rescue tool.
Differential Revision: https://reviews.freebsd.org/D38304
This commit is contained in:
@@ -212,16 +212,16 @@ CRUNCH_PROGS_usr.bin+= zstd
|
||||
CRUNCH_ALIAS_zstd= unzstd zstdcat zstdmt
|
||||
CRUNCH_LIBS+= ${LDADD_zstd}
|
||||
|
||||
CRUNCH_PROGS_usr.bin+= fetch
|
||||
CRUNCH_LIBS+= -lfetch
|
||||
|
||||
CRUNCH_PROGS_usr.bin+= tar
|
||||
CRUNCH_LIBS+= -larchive
|
||||
.if ${MK_OPENSSL} != "no"
|
||||
CRUNCH_LIBS+= -lcrypto -lssl
|
||||
CRUNCH_LIBS+= -lssl -lcrypto
|
||||
.endif
|
||||
CRUNCH_LIBS+= -lmd
|
||||
|
||||
CRUNCH_PROGS_usr.bin+= fetch
|
||||
CRUNCH_LIBS+= -lfetch
|
||||
|
||||
.if ${MK_NETCAT} != "no"
|
||||
CRUNCH_PROGS_usr.bin+= nc
|
||||
.endif
|
||||
|
||||
Reference in New Issue
Block a user