Module Name: src
Committed By: lukem
Date: Sun Jun 4 10:00:20 UTC 2023
Modified Files:
src/tools: Makefile.host Makefile.nbincludes
Log Message:
tools: use <bsd.hostinit.mk> where appropriate
bsd.hostinit.mk sets a bunch of NOxxx variables before
including bsd.init.mk (which includes bsd.own.mk),
so simplify instead of replicating the NOxxx setup
for host tools.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/tools/Makefile.host
cvs rdiff -u -r1.5 -r1.6 src/tools/Makefile.nbincludes
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/Makefile.host
diff -u src/tools/Makefile.host:1.34 src/tools/Makefile.host:1.35
--- src/tools/Makefile.host:1.34 Fri May 4 14:50:18 2018
+++ src/tools/Makefile.host Sun Jun 4 10:00:20 2023
@@ -1,11 +1,6 @@
-# $NetBSD: Makefile.host,v 1.34 2018/05/04 14:50:18 christos Exp $
+# $NetBSD: Makefile.host,v 1.35 2023/06/04 10:00:20 lukem Exp $
-NOINFO= # defined
-NOLINT= # defined
-NOMAN= # defined
-MKREPRO=no # Native toolchain might be unable to do it
-
-.include <bsd.own.mk>
+.include <bsd.hostinit.mk>
.ifndef NOCOMPATLIB
# Use TOOLDIR copy of libnbcompat and associated *.h files
Index: src/tools/Makefile.nbincludes
diff -u src/tools/Makefile.nbincludes:1.5 src/tools/Makefile.nbincludes:1.6
--- src/tools/Makefile.nbincludes:1.5 Wed Sep 14 00:41:04 2016
+++ src/tools/Makefile.nbincludes Sun Jun 4 10:00:20 2023
@@ -1,15 +1,6 @@
-# $NetBSD: Makefile.nbincludes,v 1.5 2016/09/14 00:41:04 christos Exp $
+# $NetBSD: Makefile.nbincludes,v 1.6 2023/06/04 10:00:20 lukem Exp $
-# NOxxx definitions are copied from Makefile.host, and are
-# required before .include <bsd.own.mk>. The include of bsd.own.mk
-# itself is required to get definitions of TOOL_* variables used in
-# "!=" variable assignments (which are performed early).
-#
-NOINFO= # defined
-NOLINT= # defined
-NOMAN= # defined
-
-.include <bsd.own.mk>
+.include <bsd.hostinit.mk>
_ARCHDIR= ${.CURDIR}/../../sys/arch
_INCDIR= ${.CURDIR}/../../include
