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

AUTO_OBJ: Disable in non-build targets.

Browse Source 
There's no reason to create object directories for targets like 'installworld'
or 'distributeworld', and the others in this list.  Specifying MK_AUTO_OBJ as a
make argument allows circumventing this if needed for some reason.

This fixes mergemaster creating a full object tree due to doing a 'make
installconfig' tree walk.

Reported by:	Mark Millard
Sponsored by:	Dell EMC Isilon
This commit is contained in:
Bryan Drewery 2017-11-11 01:10:46 +00:00
parent f82493cc3a
commit 58d86ed342
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Makefile
View File

@ -167,6 +167,18 @@ META_TGT_WHITELIST+= \
tinderbox toolchain \
toolchains universe world worlds xdev xdev-build
# Likewise for AUTO_OBJ. Many targets do not need object directories created
# for each visited directory. Only when things are being built are they
# needed. Having AUTO_OBJ disabled in a build target is fine as it should
# fallback to running 'make obj' as needed. If a target is not in this list
# then it is ran with MK_AUTO_OBJ=no in environment.
# 'showconfig' is in the list to avoid forcing MK_AUTO_OBJ=no for it.
AUTO_OBJ_TGT_WHITELIST+= \
_* all all-man build* depend everything *toolchain* includes \
libraries obj objlink showconfig tags xdev xdev-build native-xtools \
stage* create-packages* real-packages sign-packages package-pkg \
tinderbox universe* kernel kernels world worlds bmake
.ORDER: buildworld installworld
.ORDER: buildworld distrib-dirs
.ORDER: buildworld distribution
@ -256,6 +268,21 @@ _MAKE+= MK_META_MODE=no
.endif # !exists(/dev/filemon) && !defined(NO_FILEMON)
.endif # !defined(_CAN_USE_META_MODE)
# Only allow AUTO_OBJ for the whitelisted targets. See AUTO_OBJ_TGT_WHITELIST
# above. MK_AUTO_OBJ not checked here for "yes" as it may not yet be enabled
# since it is opportunistic.
.if empty(.MAKEOVERRIDES:MMK_AUTO_OBJ)
.for _tgt in ${AUTO_OBJ_TGT_WHITELIST}
.if make(${_tgt})
_CAN_USE_AUTO_OBJ?= yes
.endif
.endfor
.if !defined(_CAN_USE_AUTO_OBJ)
_MAKE+= MK_AUTO_OBJ=no
MK_AUTO_OBJ= no
.endif
.endif # empty(.MAKEOVERRIDES:MMK_AUTO_OBJ)
# Guess target architecture from target type, and vice versa, based on
# historic FreeBSD practice of tending to have TARGET == TARGET_ARCH
# expanding to TARGET == TARGET_CPUARCH in recent times, with known