svn commit: r336337 - head

[Kyle Evans]

Author: kevans
Date: Mon Jul 16 13:14:53 2018
New Revision: 336337
URL: https://svnweb.freebsd.org/changeset/base/336337

Log:
  Unconditionally build libnv in legacy
  
  Rather than using a config(8) built from new tree linking libnv built on
  host.

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Mon Jul 16 11:03:05 2018	(r336336)
+++ head/Makefile.inc1	Mon Jul 16 13:14:53 2018	(r336337)
@@ -1941,19 +1941,13 @@ update: .PHONY
 _elftoolchain_libs= lib/libelf lib/libdwarf
 .endif
 
-# An updated libnv is needed for the cnv(9) API used in config(8).
-# r335343 stabilized the cnvlist API used by config(8)
-.if ${BOOTSTRAPPING} < 1200070
-_libnv=	lib/libnv
-.endif
-
 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} ${_libnv}
+.for _tool in tools/build ${_elftoolchain_libs} lib/libnv
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,all,install)"; \
 	    cd ${.CURDIR}/${_tool}; \
 	    if [ -z "${NO_OBJWALK}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \