Sun Jun 4 16:54:00 2023 UTC ()
tools: revert use of <bsd.hostinit.mk>

tools/Makefile.host revision 1.35 changed from
  setting various NOxxx variables and .include <bsd.own.mk>
to
  .include <bsd.hostinit.mk>
which sets the same NOxxx variables, .include <bsd.init.mk>
which optionally .include ../Makefile.inc before .include <bsd.own.mk>.

This chnage caused build failures with HAVE_LLVM=yes, so revert rev 1.35.
(Maybe to do with the .include ../Makefile.inc. The tools/llvm* build is
tricky, and it's easier to revert this change than debug.)


(lukem)
diff -r1.35 -r1.36 src/tools/Makefile.host
cvs diff -r1.35 -r1.36 src/tools/Makefile.host (expand / switch to unified diff)

--- src/tools/Makefile.host 2023/06/04 10:00:20 1.35
+++ src/tools/Makefile.host 2023/06/04 16:53:59 1.36
@@ -1,16 +1,21 @@ @@ -1,16 +1,21 @@
1# $NetBSD: Makefile.host,v 1.35 2023/06/04 10:00:20 lukem Exp $ 1# $NetBSD: Makefile.host,v 1.36 2023/06/04 16:53:59 lukem Exp $
2 2
3.include <bsd.hostinit.mk> 3NOINFO= # defined
 4NOLINT= # defined
 5NOMAN= # defined
 6MKREPRO=no # Native toolchain might be unable to do it
 7
 8.include <bsd.own.mk>
4 9
5.ifndef NOCOMPATLIB 10.ifndef NOCOMPATLIB
6# Use TOOLDIR copy of libnbcompat and associated *.h files 11# Use TOOLDIR copy of libnbcompat and associated *.h files
7.-include "${TOOLDIR}/share/compat/defs.mk" 12.-include "${TOOLDIR}/share/compat/defs.mk"
8.elif !empty(.MAKE.OS:M*CYGWIN*) 13.elif !empty(.MAKE.OS:M*CYGWIN*)
9HOSTEXEEXT=.exe 14HOSTEXEEXT=.exe
10.endif 15.endif
11 16
12# Resolve pathnames in variables. 17# Resolve pathnames in variables.
13_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD HOST_CPPFLAGS LDADD 18_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD HOST_CPPFLAGS LDADD
14.for var in ${_RESOLVE_VARS} 19.for var in ${_RESOLVE_VARS}
15${var}:= ${${var}} 20${var}:= ${${var}}
16.endfor 21.endfor