git: 42d088299cd4 - main - Update meta.sys.mk ensure DEP_* set at level 1+
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 04 May 2023 16:46:56 UTC
The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=42d088299cd44287d6f532a6a93ac9c78ce74de7 commit 42d088299cd44287d6f532a6a93ac9c78ce74de7 Author: Simon J. Gerraty <sjg@FreeBSD.org> AuthorDate: 2023-05-04 16:46:47 +0000 Commit: Simon J. Gerraty <sjg@FreeBSD.org> CommitDate: 2023-05-04 16:46:47 +0000 Update meta.sys.mk ensure DEP_* set at level 1+ --- share/mk/meta.sys.mk | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/share/mk/meta.sys.mk b/share/mk/meta.sys.mk index 7a74ba2d5d21..f580f4962be8 100644 --- a/share/mk/meta.sys.mk +++ b/share/mk/meta.sys.mk @@ -1,4 +1,4 @@ -# $Id: meta.sys.mk,v 1.46 2023/04/18 18:43:00 sjg Exp $ +# $Id: meta.sys.mk,v 1.48 2023/05/04 16:41:10 sjg Exp $ # # @(#) Copyright (c) 2010-2021, Simon J. Gerraty @@ -188,7 +188,7 @@ META_NOECHO= : UPDATE_DEPENDFILE= NO .export UPDATE_DEPENDFILE .elif ${_filemon:T} == "filemon" && !exists(${_filemon}) -.warning ${.newline}ERROR: The filemon module (${_filemon}) is not loaded. +.error ${.newline}ERROR: The filemon module (${_filemon}) is not loaded. .endif .endif @@ -206,6 +206,15 @@ dirdeps: .endif .endif +.else # level > 0 + +# Makefile.depend* get read at level 1+ +# and often refer to DEP_MACHINE etc, +# so ensure DEP_* (for TARGET_SPEC_VARS anyway) are set +.for V in ${TARGET_SPEC_VARS} +DEP_$V = ${$V} +.endfor + .endif .else META_COOKIE_TOUCH=