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

Support SUBDIR.${MK_FOO}.${MK_BAR} expresssions.

Browse Source 
This allows simplification of Makefiles where some SUBDIR entries depend
on two things (e.g. something that depends on C++ and some other knob).

Discussed with:	imp, jhb
Obtained from:	CheriBSD
MFC after:	3 days
Sponsored by:	DARPA
This commit is contained in:
Brooks Davis 2020-03-17 18:17:32 +00:00
parent 564b9ff2a7
commit 2e1dfb346f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,8 +16,8 @@
# #
# SUBDIR A list of subdirectories that should be built as well. # SUBDIR A list of subdirectories that should be built as well.
# Each of the targets will execute the same target in the # Each of the targets will execute the same target in the
# subdirectories. SUBDIR.yes is automatically appended # subdirectories. SUBDIR.yes and SUBDIR.yes.yes are
# to this list. # automatically appended to this list.
# #
# +++ targets +++ # +++ targets +++
# #
@ -122,8 +122,8 @@ install: beforeinstall realinstall afterinstall
# SUBDIR recursing may be disabled for MK_DIRDEPS_BUILD # SUBDIR recursing may be disabled for MK_DIRDEPS_BUILD
.if !target(_SUBDIR) .if !target(_SUBDIR)
.if defined(SUBDIR) || defined(SUBDIR.yes) .if defined(SUBDIR) || defined(SUBDIR.yes) || defined(SUBDIR.yes.yes)
SUBDIR:=${SUBDIR} ${SUBDIR.yes} SUBDIR:=${SUBDIR} ${SUBDIR.yes} ${SUBDIR.yes.yes}
SUBDIR:=${SUBDIR:u} SUBDIR:=${SUBDIR:u}
.endif .endif