svn commit: r283348 - projects/bmake/share/mk
Simon J. Gerraty
sjg at FreeBSD.org
Sun May 24 02:46:09 UTC 2015
Author: sjg
Date: Sun May 24 02:46:08 2015
New Revision: 283348
URL: https://svnweb.freebsd.org/changeset/base/283348
Log:
Add options for auto obj and meta mode to sys.mk
Modified:
projects/bmake/share/mk/sys.mk
Modified: projects/bmake/share/mk/sys.mk
==============================================================================
--- projects/bmake/share/mk/sys.mk Sun May 24 02:45:15 2015 (r283347)
+++ projects/bmake/share/mk/sys.mk Sun May 24 02:46:08 2015 (r283348)
@@ -328,10 +328,30 @@ __MAKE_CONF?=/etc/make.conf
.endif
# Setup anything for the FreeBSD source build, if we're building
-# inside the source tree. Needs to be after make.conf, but before
-# local stuff.
+# inside the source tree. Needs to be after make.conf
.sinclude <src.sys.mk>
+# Some options we need now
+__DEFAULT_NO_OPTIONS+= \
+ AUTO_OBJ \
+ META_MODE \
+ META_FILES \
+ STAGING
+
+.include <bsd.mkopt.mk>
+
+.if ${MK_AUTO_OBJ} == "yes"
+# This needs to be done early - before .PATH is computed
+.sinclude <auto.obj.mk>
+.endif
+.if ${MK_META_MODE} == "yes"
+.sinclude <meta.sys.mk>
+.elif ${MK_META_FILES} == "yes"
+.MAKE.MODE= meta verbose
+.else
+MK_STAGING= no
+.endif
+
.if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL)
SHELL= ${__MAKE_SHELL}
.SHELL: path=${__MAKE_SHELL}
More information about the svn-src-projects
mailing list