aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon J. Gerraty <sjg@FreeBSD.org>2015-05-29 06:45:32 +0000
committerSimon J. Gerraty <sjg@FreeBSD.org>2015-05-29 06:45:32 +0000
commit10e781d1ba9859790840230d080517c2da66de1a (patch)
treedd871aac3214adb8e38aacd8014ed95109fa4295
parentf49116fcd96f2420f604c904ef63ccced77adc2a (diff)
downloadsrc-10e781d1ba9859790840230d080517c2da66de1a.tar.gz
src-10e781d1ba9859790840230d080517c2da66de1a.zip
Allow AUTO_OBJ with out META_MODE.
Remove frobbing of SRCCONF etc - not strictly relevant to meta mode.
Notes
Notes: svn path=/projects/bmake/; revision=283689
-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 37536aa578db..6a11477d30e9 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