[src/trunk]: src/tools If we are building date earlier, we need to use an uni...

[cjep <cjep%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/067614ba6d93
branches:  trunk
changeset: 983500:067614ba6d93
user:      cjep <cjep%NetBSD.org@localhost>
date:      Thu May 27 08:41:35 2021 +0000

description:
If we are building date earlier, we need to use an uninstalled copy
of host-mkdep and libnbcompat otherwise the build process looks for
tools that might not be there yet (e.g. fresh build).
Reviewed by martin.

diffstat:

 tools/Makefile      |   8 ++++++--
 tools/date/Makefile |  18 +++++++++++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diffs (55 lines):

diff -r 02c0a4714149 -r 067614ba6d93 tools/Makefile
--- a/tools/Makefile    Thu May 27 07:23:04 2021 +0000
+++ b/tools/Makefile    Thu May 27 08:41:35 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.210 2021/05/26 20:19:15 christos Exp $
+#      $NetBSD: Makefile,v 1.211 2021/05/27 08:41:35 cjep Exp $
 
 .include <bsd.own.mk>
 .include <bsd.endian.mk>
@@ -80,13 +80,17 @@
 # XXX .ORDER does not work when multiple targets are passed on the
 # make command line without "-j", so use dependencies in addition to .ORDER.
 #
-.ORDER: dependall-host-mkdep dependall-compat dependall-binstall
+.ORDER: dependall-host-mkdep dependall-compat dependall-binstall \
+       dependall-date
 .if make(dependall-host-mkdep) && make(dependall-compat)
 dependall-compat: dependall-host-mkdep
 .endif
 .if make(dependall-compat) && make(dependall-binstall)
 dependall-binstall: dependall-compat
 .endif
+.if make(dependall-date)
+dependall-date: dependall-host-mkdep dependall-compat
+.endif
 
 # Dependencies in SUBDIR below ordered to maximize parallel ability.
 # See above for special treatment for host-mkdep, compat, and binstall.
diff -r 02c0a4714149 -r 067614ba6d93 tools/date/Makefile
--- a/tools/date/Makefile       Thu May 27 07:23:04 2021 +0000
+++ b/tools/date/Makefile       Thu May 27 08:41:35 2021 +0000
@@ -1,6 +1,22 @@
-#      $NetBSD: Makefile,v 1.1 2021/05/26 20:19:15 christos Exp $
+#      $NetBSD: Makefile,v 1.2 2021/05/27 08:41:35 cjep Exp $
+
+.include <bsd.hostinit.mk>
 
 HOSTPROGNAME=  ${_TOOL_PREFIX}date
 HOST_SRCDIR=   bin/date
 
+# Prevent Makefile.host from trying to use the version of libnbcompat
+# from ${TOOLDIR}.
+NOCOMPATLIB=
+
+# Use uninstalled copy of host-mkdep
+HOST_MKDEP_OBJ!= cd ${.CURDIR}/../host-mkdep && ${PRINTOBJDIR}
+HOST_MKDEP=    ${HOST_MKDEP_OBJ}/host-mkdep
+MKDEP=         ${HOST_MKDEP}
+
+# Use uninstalled copy of libnbcompat and associated *.h files
+COMPATLIB_UNINSTALLED= yes
+COMPATOBJ!=    cd ${NETBSDSRCDIR}/tools/compat && ${PRINTOBJDIR}
+.-include      "${COMPATOBJ}/defs.mk"
+
 .include "${.CURDIR}/../Makefile.host"