svn commit: r337559 - head

[Kyle Evans]

Author: kevans
Date: Fri Aug 10 00:10:57 2018
New Revision: 337559
URL: https://svnweb.freebsd.org/changeset/base/337559

Log:
  Makefile.inc1: Add libl to -legacy as well
  
  libl is needed for config(8), which is a bootstrap-tool. It is possible to
  build a system WITHOUT_TOOLCHAIN to exclude lex and thus, libl. We still
  need to support building from this kind of host, though.
  
  While here, group the config(8) dependencies together and add a small
  explanation. These can likely both be scoped more clearly, but this will
  need some further investigation.
  
  Reported by:	rgrimes (not WITHOUT_TOOLCHAIN, but provoked investigation)
  MFC after:	immediately

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Fri Aug 10 00:04:32 2018	(r337558)
+++ head/Makefile.inc1	Fri Aug 10 00:10:57 2018	(r337559)
@@ -1943,13 +1943,17 @@ update: .PHONY
 _elftoolchain_libs= lib/libelf lib/libdwarf
 .endif
 
+# libnv and libl are both requirements for config(8), which is an unconditional
+# bootstrap-tool.
+_config_deps= lib/libnv usr.bin/lex/lib
+
 legacy: .PHONY
 .if ${BOOTSTRAPPING} < ${MINIMUM_SUPPORTED_OSREL} && ${BOOTSTRAPPING} != 0
 	@echo "ERROR: Source upgrades from versions prior to ${MINIMUM_SUPPORTED_REL} are not supported."; \
 	false
 .endif
 
-.for _tool in tools/build ${_elftoolchain_libs} lib/libnv
+.for _tool in tools/build ${_elftoolchain_libs} ${_config_deps}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,all,install)"; \
 	    cd ${.CURDIR}/${_tool}; \
 	    if [ -z "${NO_OBJWALK}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \