From nobody Thu Apr 20 02:00:25 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 4Q218B1CkNz464gk; Thu, 20 Apr 2023 02:00:26 +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 4Q21896tFbz3xtK; Thu, 20 Apr 2023 02:00:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681956026; 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=y7a64a2036TSKCcs8puSJknsz6DFaYq1+Szmi02cFXo=; b=ycUg5ThZQzNFPadFqTcJUI2ydwza3bhR9Ouqexup7JexauSdx1SxP/TSae69n8qNsE5TY/ LRX9pRpMBHFx3DEwWvyH9ioYE55M979Fz5yiYQxsK6+2AEj90+PsAaspzvWRdiCVui6mPS i+5n/5UJUAvpziOXMNnSCjbKIGMqIFHSZ6SYncIY5uFQVkRYyk5jMCrIMNNNt+7dnwKwIN BUPe4x6wKchFlt4uUD1ZFv0d4E7ZW4mFdooW499MVq5nD1IrtOEpQo6bGS+ycx78dNNLjg qyQBHxg0LTf/eL8MD1jAH3XkebfxX5sqOb8uBgG0j+ueeP5Fy8RoKZ8q8wwz3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681956026; 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=y7a64a2036TSKCcs8puSJknsz6DFaYq1+Szmi02cFXo=; b=eIX4nyanYgyMAzgyOp57inytidLzc4Mqd/ZnC1hn3qrDECBP6x7HkBdCj0QQTqmK/tVTVz ZQ2GKowN/WUqeR4vT7AbOA4ROBrsIGoonybhIIWs4CvFjizzb+/9ea/KNsSUVTLwITGdRK RXg0LUrPDiyh6/zGIRToIXAkL0RoFLmDhibPgA2fo7GuoWmNPRCtftWW9ft9aQTCjiBpCE +y8UzrNZv0pcha4K8mAREVdcx+llF+Kp6x3CtyVa70A0rWu2NnlPeTs5wTYUZ77fJp3ygS dlmJLKY6SP79SnzCY4PVJvOvPgcLPqmOkkzmbL9ugi4bBwA384RbNuIyckukpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681956026; a=rsa-sha256; cv=none; b=S35VT7mfM+WZtNgRtmtp6aokNzPC9qr/b7VYB5Lz3Fy1dSk54SEzsA17sp3NsjWB3yZW7e SPUL+QRz9Jrq7b31UrAez8BlDlUuv9/6ulIYrTZ1eK0IwA34i7HrBG/sqpJ/kMX4fiG1fN qNBlHGsQTd0cQuoDzjmmwGT2tAcf50TzAvOAlnkQXYOetApAaPNr+3rj523frLVSlz7Yw0 IvkdZH5UldbbRtR9VroLsnM5Jh5PkwGOl4vmOHTq1Ft/Sc/Paps93pMsGFW2NT+GBic+gx BDHCLVGwOwfMHX9QZEDBoiUbIcFlpCDpmnLyTv4hJEP35TUunYdQ7t6fJ0yKnQ== 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 4Q21895sjFzJNb; Thu, 20 Apr 2023 02:00:25 +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 33K20PCb038208; Thu, 20 Apr 2023 02:00:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33K20P9A038207; Thu, 20 Apr 2023 02:00:25 GMT (envelope-from git) Date: Thu, 20 Apr 2023 02:00:25 GMT Message-Id: <202304200200.33K20P9A038207@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: 061e8e6ba60e - main - Makefile.xtras: fix show-valid-targets 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: 061e8e6ba60e10e7d25e45e63d44a54186ed845e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=061e8e6ba60e10e7d25e45e63d44a54186ed845e commit 061e8e6ba60e10e7d25e45e63d44a54186ed845e Author: Simon J. Gerraty AuthorDate: 2023-04-20 01:59:53 +0000 Commit: Simon J. Gerraty CommitDate: 2023-04-20 01:59:53 +0000 Makefile.xtras: fix show-valid-targets Use ALL_MACHINE_LIST and leverage .MAKE.DEPENDFILE_PREFERENCE --- targets/Makefile.xtras | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/targets/Makefile.xtras b/targets/Makefile.xtras index 124bddc9b01c..6e328cd3e7cd 100644 --- a/targets/Makefile.xtras +++ b/targets/Makefile.xtras @@ -34,21 +34,20 @@ OTHER_TARGETS = \ destroy-stage \ BUILD_TARGETS_${MACHINE:tu} != cd ${_here} && \ - find . \( -name Makefile.depend -o -name ${.MAKE.DEPENDFILE:T} \) | \ + find . \( ${${.MAKE.DEPENDFILE:T} ${.MAKE.DEPENDFILE_PREFIX}:L:O:u:@m@-name $m -o@:tW:S,-o$,,} \) | \ sed 's,/Makefile.*,,;s,^./,,' | sort -u -.for _machine in ${all_machine_list} +.for _machine in ${ALL_MACHINE_LIST} _targets_${_machine} != cd ${_here} && \ - find . \( -name Makefile.depend.${_machine} -o \ - -name ${.MAKE.DEPENDFILE:T}.${_machine} \) | \ + find . \( ${.MAKE.DEPENDFILE_PREFERENCE:T:M*${MACHINE}*:S,${MACHINE},${_machine},g:O:u:@m@-name $m -o@:tW:S,-o$,,} \) | \ sed 's,/Makefile.*,,;s,^./,,' | sort -u BUILD_TARGETS_${_machine:tu} += ${_targets_${_machine}} .endfor show-valid-targets: -.for _machine in ${all_machine_list:O} +.for _machine in ${ALL_MACHINE_LIST:O} .if !empty(BUILD_TARGETS_${_machine:tu}) - @echo "Build targets for ${_machine} (leave out the ${target_dirs:S,${_here:T},,:S,^/,,:S,$,/,}):" + @echo "Build targets for ${_machine} (leave out the ${DIRDEPS_TARGETS_DIRS:S,${_here:T},,:S,^/,,:S,$,/,}):" @echo -e "${BUILD_TARGETS_${_machine:tu}:O:ts\n}" | sed -e 's,^, ,' @echo .endif