svn commit: r325973 - head

[Bryan Drewery]

Author: bdrewery
Date: Sat Nov 18 20:01:12 2017
New Revision: 325973
URL: https://svnweb.freebsd.org/changeset/base/325973

Log:
  Move top-level AUTO_OBJ logic to Makefile.sys.inc.
  
  Sponsored by:	Dell

Added:
  head/Makefile.sys.inc   (contents, props changed)
Modified:
  head/Makefile

Modified: head/Makefile
==============================================================================
--- head/Makefile	Sat Nov 18 20:01:09 2017	(r325972)
+++ head/Makefile	Sat Nov 18 20:01:12 2017	(r325973)
@@ -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
@@ -275,21 +263,6 @@ MK_META_MODE= no
 .endif	# !exists(/dev/filemon) && !defined(NO_FILEMON)
 .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

Added: head/Makefile.sys.inc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/Makefile.sys.inc	Sat Nov 18 20:01:12 2017	(r325973)
@@ -0,0 +1,39 @@
+# $FreeBSD$
+#
+# This is included very early from share/mk/src.sys.env.mk, after
+# /etc/src-env.conf but before /etc/make.conf, /etc/src.conf, or OBJDIR
+# handling.
+# - It is not safe to use .OBJDIR/OBJTOP/OBJROOT here.
+# - __ENV_ONLY_OPTIONS have been parsed by now except for opporutunistic
+#   MK_AUTO_OBJ.
+#
+
+.if ${MK_DIRDEPS_BUILD} == "no"
+# For AUTO_OBJ many targets do not need object directories created at top-level
+# 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
+
+# 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)
+_MAKEARGS+=		MK_AUTO_OBJ=no
+MK_AUTO_OBJ=		no
+.endif
+.endif	# empty(.MAKEOVERRIDES:MMK_AUTO_OBJ)
+
+.endif	# ${MK_DIRDEPS_BUILD} == "no"