aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2017-11-18 20:01:12 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2017-11-18 20:01:12 +0000
commita7fa261e37ba3d9983e8481d34ed14ecc16d59d9 (patch)
treeca0d1cef4cf487e43a81790eefd922b51e6ae6ff /Makefile
parentf7789552132d69ab34c89a9080b97b52c62c90e1 (diff)
downloadsrc-a7fa261e37ba3d9983e8481d34ed14ecc16d59d9.tar.gz
src-a7fa261e37ba3d9983e8481d34ed14ecc16d59d9.zip
Move top-level AUTO_OBJ logic to Makefile.sys.inc.
Sponsored by: Dell
Notes
Notes: svn path=/head/; revision=325973
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile29
1 files changed, 1 insertions, 28 deletions
diff --git a/Makefile b/Makefile
index f4515e5d3678..ec55add8ef8f 100644
--- a/Makefile
+++ b/Makefile
@@ -167,18 +167,6 @@ 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
@@ -245,7 +233,7 @@ SUB_MAKE= ${MAKE} -m ${.CURDIR}/share/mk
.endif
_MAKE= PATH=${PATH} MAKE_CMD="${MAKE}" ${SUB_MAKE} -f Makefile.inc1 \
- TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH}
+ TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH} ${_MAKEARGS}
.if defined(MK_META_MODE) && ${MK_META_MODE} == "yes"
# Only allow meta mode for the whitelisted targets. See META_TGT_WHITELIST
@@ -276,21 +264,6 @@ MK_META_MODE= no
.endif # ${MK_META_MODE} == yes
.endif # defined(MK_META_MODE) && ${MK_META_MODE} == yes
-# 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