Date: Sun, 23 Apr 2023 01:01:46 GMT From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: fb30bb0d4d0e - main - dirdeps.mk ensure M_dep_qual_fixes is applied Message-ID: <202304230101.33N11kAB058696@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=fb30bb0d4d0ed3beb27116761ac0c941607e3906 commit fb30bb0d4d0ed3beb27116761ac0c941607e3906 Author: Simon J. Gerraty <sjg@FreeBSD.org> AuthorDate: 2023-04-23 01:00:45 +0000 Commit: Simon J. Gerraty <sjg@FreeBSD.org> CommitDate: 2023-04-23 01:00:45 +0000 dirdeps.mk ensure M_dep_qual_fixes is applied --- share/mk/dirdeps.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/mk/dirdeps.mk b/share/mk/dirdeps.mk index 90ef5f55c790..6fedd00310e9 100644 --- a/share/mk/dirdeps.mk +++ b/share/mk/dirdeps.mk @@ -1,4 +1,4 @@ -# $Id: dirdeps.mk,v 1.156 2023/04/18 18:39:09 sjg Exp $ +# $Id: dirdeps.mk,v 1.157 2023/04/22 21:07:51 sjg Exp $ # SPDX-License-Identifier: BSD-2-Clause # @@ -645,9 +645,9 @@ _dm := ${DEP_MACHINE} # apply the same filtering that we do when qualifying DIRDEPS. # M_dep_qual_fixes expects .${MACHINE}* so add (and remove) '.' # Again we expect that any already qualified machines are fully qualified. -_machines := ${_machines:M*,*} ${_machines:N*,*:@DEP_MACHINE@${DEP_TARGET_SPEC}@:S,^,.,:${M_dep_qual_fixes:ts:}:O:u:S,^.,,} +_machines := ${_machines:M*,*} ${_machines:N*,*:@DEP_MACHINE@${DEP_TARGET_SPEC}@:S,^,.,:S,^.,,} DEP_MACHINE := ${_dm} -_machines := ${_machines:O:u} +_machines := ${_machines:${M_dep_qual_fixes:ts:}:O:u} .endif # reset each time through
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304230101.33N11kAB058696>