summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorsjg <sjg@FreeBSD.org>2015-05-29 06:45:32 +0000
committersjg <sjg@FreeBSD.org>2015-05-29 06:45:32 +0000
commit7687e7609cdd087938d5428efd7584b0fcb73af7 (patch)
treedd871aac3214adb8e38aacd8014ed95109fa4295 /share
parent4989a0442a6f64acc9e86d1692f5fee54ed6456a (diff)
downloadFreeBSD-src-7687e7609cdd087938d5428efd7584b0fcb73af7.zip
FreeBSD-src-7687e7609cdd087938d5428efd7584b0fcb73af7.tar.gz
Allow AUTO_OBJ with out META_MODE.
Remove frobbing of SRCCONF etc - not strictly relevant to meta mode.
Diffstat (limited to 'share')
-rw-r--r--share/mk/local.sys.mk7
1 files changed, 1 insertions, 6 deletions
diff --git a/share/mk/local.sys.mk b/share/mk/local.sys.mk
index 37536aa..6a11477 100644
--- a/share/mk/local.sys.mk
+++ b/share/mk/local.sys.mk
@@ -7,7 +7,7 @@ _TARGETS:= ${.TARGETS}
.endif
.if (!empty(_TARGETS) && ${_TARGETS:Nbuildworld:Nuniverse:Ninstallworld} == "") || defined(WITHOUT_META_MODE)
-MK_AUTO_OBJ= no
+MK_AUTO_OBJ?= no
MK_META_MODE= no
MK_STAGING= no
MK_STAGING_PROG= no
@@ -15,11 +15,6 @@ MK_SYSROOT= no
UPDATE_DEPENDFILE=NO
.endif
-SRCCONF:= ${.PARSEDIR}/src.conf
-# ensure we are self contained
-__MAKE_CONF:= ${SRCCONF}
-.-include "src.conf"
-
# some handy macros
_this = ${.PARSEDIR:tA}/${.PARSEFILE}
# some useful modifiers
OpenPOWER on IntegriCloud