git: 41d638f203ca - main - Update dirdeps.mk

The branch main has been updated by sjg:

URL: https://cgit.FreeBSD.org/src/commit/?id=41d638f203caca728d9ba126241b3772155b7a8d

commit 41d638f203caca728d9ba126241b3772155b7a8d
Author:     Simon J. Gerraty <sjg@FreeBSD.org>
AuthorDate: 2023-05-13 21:05:19 +0000
Commit:     Simon J. Gerraty <sjg@FreeBSD.org>
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