Stop building libl and liby

Those libs aren't needed anymore so stop building them for the bootstrap tools
or the compat libs.

Reviewed by:	bapt, emaste
X-Differential Revision:	D24171
This commit is contained in:
Emmanuel Vadot 2020-03-26 08:23:09 +00:00
parent a0be362828
commit eb61f7bdf2
2 changed files with 4 additions and 8 deletions

View File

@ -2039,9 +2039,9 @@ update: .PHONY
# #
# libnv and libl are both requirements for config(8), which is an unconditional # libnv is a requirement for config(8), which is an unconditional
# bootstrap-tool. # bootstrap-tool.
_config_deps= lib/libnv usr.bin/lex/lib _config_deps= lib/libnv
legacy: .PHONY legacy: .PHONY
.if ${BOOTSTRAPPING} < ${MINIMUM_SUPPORTED_OSREL} && ${BOOTSTRAPPING} != 0 .if ${BOOTSTRAPPING} < ${MINIMUM_SUPPORTED_OSREL} && ${BOOTSTRAPPING} != 0
@ -2185,10 +2185,7 @@ _kbdcontrol= usr.sbin/kbdcontrol
_bootstrap_tools_links+=kbdcontrol _bootstrap_tools_links+=kbdcontrol
.endif .endif
_yacc= lib/liby \ _yacc= usr.bin/yacc
usr.bin/yacc
${_bt}-usr.bin/yacc: ${_bt}-lib/liby
.if ${MK_BSNMP} != "no" .if ${MK_BSNMP} != "no"
_gensnmptree= usr.sbin/bsnmpd/gensnmptree _gensnmptree= usr.sbin/bsnmpd/gensnmptree
@ -2809,7 +2806,7 @@ lib/libcasper__L: lib/libnv__L
lib/liblzma__L: lib/libthr__L lib/liblzma__L: lib/libthr__L
lib/libzstd__L: lib/libthr__L lib/libzstd__L: lib/libthr__L
_generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib _generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib}
.if ${MK_IPFILTER} != "no" .if ${MK_IPFILTER} != "no"
_generic_libs+= sbin/ipf/libipf _generic_libs+= sbin/ipf/libipf
.endif .endif

View File

@ -39,7 +39,6 @@ LIBCOMPATIMAKE+= ${LIBCOMPATWMAKE:NINSTALL=*:NDESTDIR=*} \
_LC_LIBDIRS.yes= lib _LC_LIBDIRS.yes= lib
_LC_LIBDIRS.yes+= gnu/lib _LC_LIBDIRS.yes+= gnu/lib
_LC_LIBDIRS.yes+= usr.bin/lex/lib
_LC_LIBDIRS.${MK_CDDL:tl}+= cddl/lib _LC_LIBDIRS.${MK_CDDL:tl}+= cddl/lib
_LC_LIBDIRS.${MK_CRYPT:tl}+= secure/lib _LC_LIBDIRS.${MK_CRYPT:tl}+= secure/lib
_LC_LIBDIRS.${MK_KERBEROS:tl}+= kerberos5/lib _LC_LIBDIRS.${MK_KERBEROS:tl}+= kerberos5/lib