git: 49b6bc83cc4e - main - meta: print some additional variables on build errors.

The branch main has been updated by stevek:

URL: https://cgit.FreeBSD.org/src/commit/?id=49b6bc83cc4e735da75abe104d4deb0ed52c4958

commit 49b6bc83cc4e735da75abe104d4deb0ed52c4958
Author:     Stephen J. Kiernan <stevek@FreeBSD.org>
AuthorDate: 2023-04-18 04:32:06 +0000
Commit:     Stephen J. Kiernan <stevek@FreeBSD.org>
CommitDate: 2023-04-18 05:30:34 +0000

    meta: print some additional variables on build errors.
    
    Add CPUTYPE and MACHINE_CPUARCH to the list of variables printed
    when there are build errors.
    
    Protect local.sys.mk from multiple inclusion.
    
    Reviewed by:    sjg
    Obtained from:  Juniper Networks, Inc.
---
 share/mk/local.sys.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/share/mk/local.sys.mk b/share/mk/local.sys.mk
index 519c72df2383..39605c05e129 100644
--- a/share/mk/local.sys.mk
+++ b/share/mk/local.sys.mk
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+.if !target(_${_this}_)
+_${_this}_: .NOTMAIN
+
 .if ${MK_DIRDEPS_BUILD} == "yes" || ${MK_META_MODE} == "yes"
 
 # Not in the below list as it may make sense for non-meta mode
@@ -21,10 +24,12 @@ MAKE_PRINT_VAR_ON_ERROR+= \
 	.MAKE \
 	.OBJDIR \
 	.TARGETS \
+	CPUTYPE \
 	DESTDIR \
 	LD_LIBRARY_PATH \
 	MACHINE \
 	MACHINE_ARCH \
+	MACHINE_CPUARCH \
 	MAKEOBJDIRPREFIX \
 	MAKESYSPATH \
 	MAKE_VERSION \
@@ -87,3 +92,5 @@ META_NOPHONY?=
 META_COOKIE_RM?=
 META_COOKIE_TOUCH?=
 META_DEPS+=	${META_NOPHONY}
+
+.endif