From nobody Mon Jul 21 16:12:34 2025 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 4bm55Z45YVz62psJ; Mon, 21 Jul 2025 16:12:34 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bm55Z1qffz44X8; Mon, 21 Jul 2025 16:12:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753114354; 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=G+6g/b13/o1yZYwYOoUfCa7qhWy9EAni8XRQMUIQMRc=; b=SxteKShfb5nv1WPj7+YmQnaXj8oPdv076FT2AYgcKI8RaUMyqGXSciAXMPw506Hp1SkC6I tFC5eNlq/ljToXnGUBkEZhg0PTpKT+a/K4u1kHckI7QL1l0EnM0ptc3QXicDorL+e7UIoI H+DemNXIl008jaOZil7KxQRVBig+zA5GM5nwxbMzvYveniEUeRLfaUdTn9Orcisxd0XXAA bNm4bKtiFBdEOa7CnnRlMUan5kDf7dglD7Akb5ZsP2Ixl89W5jJrfI35ul2BdhG8AIPFJ3 y4aWECyybKp1Ctehj3mRofqQ0y4YUjLKKwhKXB6t9aOBRxl+uE2IKdQ1jgVj6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753114354; 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=G+6g/b13/o1yZYwYOoUfCa7qhWy9EAni8XRQMUIQMRc=; b=F20OA+y6KSeNCgjZjBg/1ECWEafUrPR1V4A+6hABdIIHoW1TLDls/bBCBZUmceuZzWV0tO E51W6IV1gKBpMtX1GMhKLB0YX2x04aIOvuw/SLrVLWH/uRb9YeENbAUZUUaLN4ss6IWN2c c08XyhOkb14jrrGuBmrlUqI6Bn/Wb0G0UiBpsbhVlBIwlcWCfjxjLOlQ5ch6RQ3W5RAZ6G zfWbWM6UVB0jFyxOuyIyDTD4p2m18WCdIMqFWiwfYc4MAK+aWMWViqULzgxvQL1aKYEkeP HqjN6sxhh/H1Hn/FzK3wXyFqetK2Qlq6cFDYegCUhazhJUZUQoJI7CMBcPVopQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753114354; a=rsa-sha256; cv=none; b=MshbkU4A0KujWFk8VgCw+8bsgmuHzB5KYAZGGCHJz5RHZrCc927Lhqq8WhdfSjq3YQcz9V nsqRRrN1tzRBLGYTt9K8S03gM4Hw7aY3c1bYckI+rUmlw1GHqSfIxy5m1uM2G9IWsIbfl+ 908PkbWDXXZKSpMwiOSCE4Cwc3nn2vRgQGWKq84849BDezL7DjJ99sN9Rffo5hMcis1iJg kzwC3WrcfabBoBRqxkSIsb/Z/g6tHaWy3UHCCCKPQrF7lxhbh3Txjjb3e5vPM6VrVNGJOB 3+tQorTtKViIRv/H+YGD/EZOLeucG2qlF86VzjDS0Axiya53RjvE5I3DpUSUrw== 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 4bm55Z1QSMz14BY; Mon, 21 Jul 2025 16:12:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56LGCYus003427; Mon, 21 Jul 2025 16:12:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56LGCYUO003419; Mon, 21 Jul 2025 16:12:34 GMT (envelope-from git) Date: Mon, 21 Jul 2025 16:12:34 GMT Message-Id: <202507211612.56LGCYUO003419@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: 3717484168ee - main - bsd.subdir.mk skip _SUBDIR for DIRDEPS_BUILD 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 3717484168eea22f318658d46b1d59257c0cce4d Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=3717484168eea22f318658d46b1d59257c0cce4d commit 3717484168eea22f318658d46b1d59257c0cce4d Author: Simon J. Gerraty AuthorDate: 2025-07-21 16:11:44 +0000 Commit: Simon J. Gerraty CommitDate: 2025-07-21 16:11:44 +0000 bsd.subdir.mk skip _SUBDIR for DIRDEPS_BUILD For DIRDEPS_BUILD we want to ignore _SUBDIR regardless of .MAKE.LEVEL Reviewed by: stevek Differential Revision: https://reviews.freebsd.org/D51454 --- share/mk/bsd.subdir.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk index cf19c9d66201..289e3d591c8c 100644 --- a/share/mk/bsd.subdir.mk +++ b/share/mk/bsd.subdir.mk @@ -76,13 +76,14 @@ obj: .PHONY .endif .if !defined(NEED_SUBDIR) +.if ${MK_DIRDEPS_BUILD} == "yes" +# ignore this +_SUBDIR: # .MAKE.DEPENDFILE==/dev/null is set by bsd.dep.mk to avoid reading # Makefile.depend -.if ${.MAKE.LEVEL} == 0 && ${MK_DIRDEPS_BUILD} == "yes" && !empty(SUBDIR) && \ - ${.MAKE.DEPENDFILE} != "/dev/null" +.if ${.MAKE.LEVEL} == 0 && !empty(SUBDIR) && ${.MAKE.DEPENDFILE} != "/dev/null" .include -# ignore this -_SUBDIR: +.endif .endif .endif