# bsd.own.mk |    7 +++++--
# 1 file changed, 5 insertions(+), 2 deletions(-)
# svn status
M       share/mk/bsd.own.mk

Index: share/mk/bsd.own.mk
===================================================================
--- share/mk/bsd.own.mk	(revision 300164)
+++ share/mk/bsd.own.mk	(working copy)
@@ -222,7 +222,6 @@ XZ_CMD?=	xz -T ${XZ_THREADS}
 XZ_CMD?=	xz
 .endif
 
-.if !defined(_WITHOUT_SRCCONF)
 #
 # Define MK_* variables (which are either "yes" or "no") for users
 # to set via WITH_*/WITHOUT_* in /etc/src.conf and override in the
@@ -652,10 +651,13 @@ MK_${vv:H}:=	${MK_${vv:T}}
 .endif
 .endfor
 
+.if !defined(_WITHOUT_SRCCONF)
 #
 # MK_* options that default to "yes" if the compiler is a C++11 compiler.
 #
 .include <bsd.compiler.mk>
+.endif
+
 .for var in \
     LIBCPLUSPLUS
 .if defined(WITH_${var}) && defined(WITHOUT_${var})
@@ -664,7 +666,7 @@ MK_${vv:H}:=	${MK_${vv:T}}
 .if defined(MK_${var})
 .error MK_${var} can't be set by a user.
 .endif
-.if ${COMPILER_FEATURES:Mc++11}
+.if defined(_WITHOUT_SRCCONF) || ${COMPILER_FEATURES:Mc++11}
 .if defined(WITHOUT_${var})
 MK_${var}:=	no
 .else
@@ -679,6 +681,7 @@ MK_${var}:=	no
 .endif
 .endfor
 
+.if !defined(_WITHOUT_SRCCONF)
 .if ${MK_CTF} != "no"
 CTFCONVERT_CMD=	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .elif defined(.PARSEDIR) || (defined(MAKE_VERSION) && ${MAKE_VERSION} >= 5201111300)