From nobody Sat May 13 21:06:04 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 4QJdTS6S0sz4Bmpc; Sat, 13 May 2023 21:06:04 +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 4QJdTS60flz3y4V; Sat, 13 May 2023 21:06:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684011964; 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=UorbuhhjQ6W6iUkTjuGINmCbfyLZuVuC2ApcwTp9Lyw=; b=sqHmkVlOl7Nch1W3VEGCEE+sbfrC74oUMovnJ59kfqfOMpbvcyxt/BbWokUYmustsbs+eS +OeHQdZxQYNPKaBuC33vQ8xLvNgxOnvN0i70pla8p5xGAFDVrqHCb1sv0YD3iSrAHAC9uX llzfRvMPlJ3BtvZC3iuL0eijrA63070CUUlOhD2isPg09LczScWyMd/M2WjO5AxbkYyO0t ymoyRgOMZ9zlFQOfMLjPQP0WbwMnxDPxUyK0vxI6grTI4SEC0+nb4WHYmdezWSP4XB/ebO QejrlqFc4sujozMBfQsv3iA7sm8L3lQrIMzE8DsVxQGj55C7qK9xIjD1lsplkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684011964; 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=UorbuhhjQ6W6iUkTjuGINmCbfyLZuVuC2ApcwTp9Lyw=; b=OF9DRBQdtDw4EjxO3IDQx8e+MbKWBOPgiHQMz3ORpR1nzT4wtaCzHJ88VMyf1/7bAsmn10 MYN5+AQV6ePLhBsuOKJTb2JjnPXvZIklza5AnG/LNjbwiR18wFZZebTVEQctjdwotfibZs PzWiuvdPjLe+fGVAQ5lV29bUCILzVcWuOslRRAh9rERM/u/eZJcRRkvLJ3hO+LkFHBk7gQ M6gEEzTDQyNQZifIv2f7NUA+foIZPkvXRmu5a3R2NmU/Vp0iQFcYt9/dQqLIEe2VgvBEvx pkcj50QZxNWmE5K/jabybY4Fw/9FAnI3nnIp8Su8MT837KKyEe86k7JV9LjHSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684011964; a=rsa-sha256; cv=none; b=HdDI1Ui8FR6a0jOwYq11BXG0gNrs2qBE8WJNpgIMNteS3nfnCytqv72cKnGjzgKvaSdWYf RIMd5k9D+W1hS3ZqA5HmWtZwn+BSMIWB/QdAW6xvXobxlUSC7yVoA3MQ+ZPUIhz88u3iGM FSN4Awij+hli/VXVNmeEaKXyFkRH7y3SgwzfLhTQpBJkjLY2sek9GZcNxixBdAgLCuoZTV K/DOVBpAYxPckUYXXdbNHTj6M7V2CgGxPAnubIrids/UtFxjrhshJVSck1SaBJhrrPjDDU IwlhAM1dLu80bu6+pvUAI1e7P8f/bUiQj6bcuncAd0uyDVAcAVM9/rZ/eC7b6w== 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 4QJdTS53DpzXNc; Sat, 13 May 2023 21:06:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34DL64OM060153; Sat, 13 May 2023 21:06:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34DL64aP060152; Sat, 13 May 2023 21:06:04 GMT (envelope-from git) Date: Sat, 13 May 2023 21:06:04 GMT Message-Id: <202305132106.34DL64aP060152@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: 41d638f203ca - main - Update dirdeps.mk 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: 41d638f203caca728d9ba126241b3772155b7a8d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=41d638f203caca728d9ba126241b3772155b7a8d commit 41d638f203caca728d9ba126241b3772155b7a8d Author: Simon J. Gerraty AuthorDate: 2023-05-13 21:05:19 +0000 Commit: Simon J. Gerraty CommitDate: 2023-05-13 21:05:56 +0000 Update dirdeps.mk Ensure host build_dirs are not qualified. --- share/mk/dirdeps.mk | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/share/mk/dirdeps.mk b/share/mk/dirdeps.mk index aafa5ab47557..da5350be480f 100644 --- a/share/mk/dirdeps.mk +++ b/share/mk/dirdeps.mk @@ -1,4 +1,4 @@ -# $Id: dirdeps.mk,v 1.160 2023/05/10 20:44:58 sjg Exp $ +# $Id: dirdeps.mk,v 1.161 2023/05/13 21:02:14 sjg Exp $ # SPDX-License-Identifier: BSD-2-Clause # @@ -717,7 +717,16 @@ _build_dirs += \ ${_machines:Nhost*:@m@${__unqual_depdirs:@d@$d.$m@}@} # qualify everything now -_build_dirs := ${_build_dirs:${M_dep_qual_fixes:ts:}:O:u} +.if ${_debug_reldir} +.info _build_dirs=${_build_dirs} +.endif +# make sure we do not mess with qualifying "host" entries +_build_dirs := ${_build_dirs:M*.host*} \ + ${_build_dirs:N*.host*:${M_dep_qual_fixes:ts:}} +_build_dirs := ${_build_dirs:O:u} +.if ${_debug_reldir} +.info _build_dirs=${_build_dirs} +.endif .endif # empty DIRDEPS