From nobody Wed Aug 16 15:31:58 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 4RQsZ71GmPz4qnB3; Wed, 16 Aug 2023 15:31:59 +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 4RQsZ70qpCz3DpM; Wed, 16 Aug 2023 15:31:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692199919; 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=Tny43CqEaU0GuBl12GMQ6up6JMKI43zcj3r1Zlmvamo=; b=MoylvAqvidpRZ4Dd5l9R5B8rXy1iMR3wHUoVJrlzPjGrH/OdCbfyF+0dxQixBWOqtf8O51 WfI9xXSnYTNBcSiztVgM5qLvybwHZZlrjVTrmttxUtTxNviQVngv7F+H+sRr61ci86I+wa lZyBtPOID9bXb3mh+fAmlUNM2ns+G0GPNzB91ZEownNLeygHNpl3gpHiAESaPfLJ5EA1iq 0t3UdkFzzdTNOnBc9PTa+MCMhOwebBOnze9JMsjKLi2mCdLh2Re/ZcyQONZcRvtrOVk7Qr 0IK2ueXp6nqPoIydCyN+SbvXxySapuVsCID2LkZoXX1e2idraQGzTmvb1xhzmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692199919; 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=Tny43CqEaU0GuBl12GMQ6up6JMKI43zcj3r1Zlmvamo=; b=imzW8B2S01vwByM0Zpw6uMxoVSJ01K3kpdJ/GuULTrfZFyTA4tmX1t59hhLpL5uwBGm2bu zsnIaJuAd95KvqaPR7IvfiHAiewFVJeSMdv01FRNhh7TrD9lKsw0EUjwThQSsgMgRDi846 8HNSW1yiJ+ROTpD1N4bZ/RPZ+zVn7S4yDhZwB/bBeDgho9ic8fVLEqWEr+7ICv/RSzC3Lx WZwKg5wigd9OX08utpTCnO/UYJKD7R9sy9OgYFpXslYKcLrFOi4SWzFhfI/u68eJIgje9M aXorSZmCTg2S+iKe3JrF8PBtKN25FpsIRUGgdI7jBM/PePvBVaaOdKM7eXZJLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692199919; a=rsa-sha256; cv=none; b=qHmwREbgw6tLlCvWu5ZGrJjy8ZNweXaSRnwu/hiRS/t5ui3jkZaKIrjTH3KDwO9X7YEjgO eBPo3HclKrz9TC2DR0wzbV6xuDC9TjdFm33xrIlyB1MQ/VZm5RvQOxb2iM4NDUJm9S9MLz YiTT1hMfLf5f/GngxHVl0Hl80nZ6JhHjb78oYD0MglnUq+OYdF0a93dxa0CoALv4RY23rB 9+xdemhG3TipcIMCK1k7Hk5Z3v415mTVMuRfV6PEkneh44810EJS9eVt8xXRsCdUn+RF3h dl327ABFG39CTK7glM8FdAFuRk1hzJa44MDWhdVyUajmzz8+8DiO1WWOzh83cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RQsZ671PyzxRM; Wed, 16 Aug 2023 15:31:58 +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 37GFVwO0020194; Wed, 16 Aug 2023 15:31:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GFVwAW020191; Wed, 16 Aug 2023 15:31:58 GMT (envelope-from git) Date: Wed, 16 Aug 2023 15:31:58 GMT Message-Id: <202308161531.37GFVwAW020191@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: 93ac817faed2 - main - local.dirdeps.mk ensure tools/build is built if needed 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: 93ac817faed22c7d7d7de5211ac6eb7da6910e02 Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=93ac817faed22c7d7d7de5211ac6eb7da6910e02 commit 93ac817faed22c7d7d7de5211ac6eb7da6910e02 Author: Simon J. Gerraty AuthorDate: 2023-08-16 15:31:11 +0000 Commit: Simon J. Gerraty CommitDate: 2023-08-16 15:31:11 +0000 local.dirdeps.mk ensure tools/build is built if needed If MK_host_egacy is yes, we need it built, make sure that happens. Reviewed by: stevek --- share/mk/local.dirdeps.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/share/mk/local.dirdeps.mk b/share/mk/local.dirdeps.mk index 1bf81e72f363..14024c06ac0e 100644 --- a/share/mk/local.dirdeps.mk +++ b/share/mk/local.dirdeps.mk @@ -84,7 +84,11 @@ DIRDEPS_FILTER.xtras= DIRDEPS_FILTER.xtras+= Nusr.bin/clang/clang.host .endif -.if ${DEP_MACHINE} != "host" +.if ${DEP_MACHINE:Nhost*} == "" +.if ${MK_host_egacy} == "yes" && ${DEP_RELDIR:Ntools/build:Ntargets/*:N*/stage} != "" +DIRDEPS += tools/build +.endif +.else MK_host_egacy.${DEP_MACHINE}= no # this is how we can handle optional dependencies