From f174619c38c309e172344f5d21b324d47819f5fd Mon Sep 17 00:00:00 2001
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Sat, 23 Sep 2023 15:58:13 -0700
Subject: [PATCH] Guard CROSS_TARGET_FLAGS from buildworld

Until a better arrangment is worked out, guard the setting of
CROSS_TARGET_FLAGS in local.sys.mk with check for DIRDEPS_BUILD.

Using a separate flag for CROSS_TARGET that can be reset by
bsd.compat.mk is probably the right thing.
---
 share/mk/local.sys.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/share/mk/local.sys.mk b/share/mk/local.sys.mk
index eb21380f051c..d5d3ff75a3c4 100644
--- a/share/mk/local.sys.mk
+++ b/share/mk/local.sys.mk
@@ -95,11 +95,13 @@ META_COOKIE_RM?=
 META_COOKIE_TOUCH?=
 META_DEPS+=	${META_NOPHONY}
 
+.if ${MK_DIRDEPS_BUILD} == "yes"
 .if ${MACHINE:Nhost*:Ncommon} != "" && ${MACHINE} != ${HOST_MACHINE}
 # cross-building
 CROSS_TARGET_FLAGS?= -target ${MACHINE_ARCH}-unknown-freebsd${FREEBSD_REVISION}
 CFLAGS+= ${CROSS_TARGET_FLAGS}
 ACFLAGS+= ${CROSS_TARGET_FLAGS}
 .endif
+.endif
 
 .endif