diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2023-05-04 16:46:47 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2023-05-04 16:46:47 +0000 |
| commit | 42d088299cd44287d6f532a6a93ac9c78ce74de7 (patch) | |
| tree | 422afa3322a0f82d827da5df8de57583594574fd | |
| parent | bf206a1db26e44180466ea2258a2b82467ffb99e (diff) | |
| download | src-42d088299cd44287d6f532a6a93ac9c78ce74de7.tar.gz src-42d088299cd44287d6f532a6a93ac9c78ce74de7.zip | |
Update meta.sys.mk ensure DEP_* set at level 1+
| -rw-r--r-- | share/mk/meta.sys.mk | 13 |
1 files 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= |