From e772b82d0bec65843a97c3916a8cfa63c12ee222 Mon Sep 17 00:00:00 2001
From: bz <bz@FreeBSD.org>
Date: Tue, 17 Jun 2008 09:06:46 +0000
Subject: For make universe, in addition to make.conf, also ignore a src.conf
 with possibe non-default options.

Reviewed by:	ru
MFC after:	10 days
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 80838cc..87ae9c6 100644
--- a/Makefile
+++ b/Makefile
@@ -294,7 +294,7 @@ universe_${target}:
 	@echo ">> ${target} started on `LC_ALL=C date`"
 	-cd ${.CURDIR} && ${MAKE} ${JFLAG} buildworld \
 	    TARGET=${target} \
-	    __MAKE_CONF=/dev/null \
+	    __MAKE_CONF=/dev/null SRCCONF=/dev/null \
 	    > _.${target}.buildworld 2>&1
 	@echo ">> ${target} buildworld completed on `LC_ALL=C date`"
 .endif
@@ -306,7 +306,7 @@ universe_${target}:
 	-cd ${.CURDIR} && ${MAKE} ${JFLAG} buildkernel \
 	    TARGET=${target} \
 	    KERNCONF=${kernel} \
-	    __MAKE_CONF=/dev/null \
+	    __MAKE_CONF=/dev/null SRCCONF=/dev/null \
 	    > _.${target}.${kernel} 2>&1
 .endfor
 	@echo ">> ${target} completed on `LC_ALL=C date`"
-- 
cgit v1.1