make universe and /etc/src.conf

[Eric van Gyzen]

I just tried a "make universe", and all the kernels failed because they couldn't
find the config files.  I had forgotten that I have this in /etc/src.conf:

	KERNCONF=NUMA
	KERNCONFDIR=/etc

Since "make universe" is primarily used for build-testing changes in src,
shouldn't it ignore /etc/src.conf (and possibly /etc/src-env.conf), like the
following?  Or is "make universe" used for other purposes for which it really
should read /etc/src*.conf?

--- Makefile	(revision 304226)
+++ Makefile	(working copy)
@@ -479,6 +479,7 @@
 universe_${target}_${target_arch}: universe_${target}_prologue .MAKE .PHONY
 	@echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} started on `LC_ALL=C date`"
 	@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
+	    SRCCONF=/dev/null SRC_ENV_CONF=/dev/null \
 	    ${SUB_MAKE} ${JFLAG} ${UNIVERSE_TARGET} \
 	    TARGET=${target} \
 	    TARGET_ARCH=${target_arch} \

Thanks,

Eric