From nobody Sat Sep 23 22:58:35 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RtPgv58hNz4vNLS; Sat, 23 Sep 2023 22:58:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RtPgv4d9Gz3g0x; Sat, 23 Sep 2023 22:58:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695509915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qGwFD8TShnH750iSp134PTV5QYT6tbLDW2BE2GCT91Y=; b=yCL+H86EVVtwBagCOcp/L3FKJ1ViZZFewihVKl8SRaJ2SZcYNdN+kgbWa++s8mRpCcyw3X E/4ov1A28kB903+p96wzt8oOPNRF9eUWDF+idyFr98RrFanrHk+/ZUfql36JOzh/tt2s8W Edq9CixQ4/ci0UtCai8hNY3CCnhIRNr4OB2f+PFI1YdDGv1DIjP9Or7fHBZ7jpVY3Fth/y zkVyq+qIWERYwClnwx6SrEcwTChrN1M8m7Rkc8Tlbh/SEj7WCJVIwr5kNpq6LPZ64oUogd 2NLCM5UWycsqrGUk7Ux0H9ua+dCA1ExN921Vz8etRSB0jH7mNy7WLz0B3yGsIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695509915; a=rsa-sha256; cv=none; b=k2zIJFGYYE8JX07OoRRGELbX0PMeUTt4POSkps69DA8ZNoiJyXIud3y5Xzkc/Ib25FyxaZ bTOyEFNOTQNTLwqiFlHyqMnxxf3M27uGu8xJjWZm1tPsQEh5yihFEZZGSJ/rFq0+N8boDl 2kwuIann1rzBjcpZikj130w7txXm5ZUCS/G1ZEKMlPlnSDl7jafLXJzX2EkGuae6ZOl/nU v72qBV22ugrsqGP7jIz/JjEDbcX4QAS9I9Y9L3cpfym/qblcXv+jmag87nTZc/RS5KZ4Vi RmOUZPM0mpOxhwQOZpUSIu7nhdUO0FrJ2B0jQhggRRxNARTq0hg1JaDdWZVBsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695509915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qGwFD8TShnH750iSp134PTV5QYT6tbLDW2BE2GCT91Y=; b=fW4drysWEJSMp9CyZjOYEd+neU+c4KsXUlCH60kvCMAA/ht8ulZcqEEead+mnJjWbJ24AZ KZ8oxRBp9+cBy0e/w1N2gQXjw9ww6hGEdhoGkZET9XeLhcZSxOHhqN28oGNlCfeS6VysTV gnhOdHC5GrSlfyIypSis2aZeUUYxBmM1w+P1c5+IpfbmagPoQSf69G6LNp1wKnzT64o22l LxwwxE4UGaoTyj4zrHrZv0Waxejh3yeOL8ZzUdGYbnlw45OSpW9tHq+rkUUgZTllqVbgKm ywRALu7WWmWa1R464M8tHpZuXh2TDSomiM92heH4ic2KMAcNIct8vM5QfankAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RtPgv3ZQmz7ZY; Sat, 23 Sep 2023 22:58:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38NMwZS2052629; Sat, 23 Sep 2023 22:58:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38NMwZlh052626; Sat, 23 Sep 2023 22:58:35 GMT (envelope-from git) Date: Sat, 23 Sep 2023 22:58:35 GMT Message-Id: <202309232258.38NMwZlh052626@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: f174619c38c3 - main - Guard CROSS_TARGET_FLAGS from buildworld List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f174619c38c309e172344f5d21b324d47819f5fd Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=f174619c38c309e172344f5d21b324d47819f5fd commit f174619c38c309e172344f5d21b324d47819f5fd Author: Simon J. Gerraty AuthorDate: 2023-09-23 22:58:13 +0000 Commit: Simon J. Gerraty CommitDate: 2023-09-23 22:58:13 +0000 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