d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a guard for broken SUBDIR.${MK_FOO} use

Browse Source 
Check for the variable SUBDIR. and error as it usually means someone
forgot to include src.opts.mk.

This guard from CheriBSD found the bugs in r367655 and r367728.

Reviewed by:	bdrewery, arichardson
Obtained from:	CheriBSD
Sponsored by:	DARPA
Differential Revision:	https://reviews.freebsd.org/D27211
This commit is contained in:
Brooks Davis 2020-11-16 19:15:11 +00:00
parent a521f21164
commit 02e65672b4
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
share/mk/bsd.subdir.mk
View File

@ -127,6 +127,12 @@ SUBDIR:=${SUBDIR} ${SUBDIR.yes} ${SUBDIR.yes.yes}
SUBDIR:=${SUBDIR:u} SUBDIR:=${SUBDIR:u}
.endif .endif
.if defined(SUBDIR.)
.error ${.CURDIR}: Found variable SUBDIR. with value "${SUBDIR.}". This was \
probably caused by using SUBDIR.$${MK_FOO} without including \
<src.opts.mk> or by using an invalid $${MK_FOO} option.
.endif
# Subdir code shared among 'make <subdir>', 'make <target>' and SUBDIR_PARALLEL. # Subdir code shared among 'make <subdir>', 'make <target>' and SUBDIR_PARALLEL.
_SUBDIR_SH= \ _SUBDIR_SH= \
if test -d ${.CURDIR}/$${dir}.${MACHINE_ARCH}; then \ if test -d ${.CURDIR}/$${dir}.${MACHINE_ARCH}; then \