summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorbz <bz@FreeBSD.org>2008-06-17 09:06:46 +0000
committerbz <bz@FreeBSD.org>2008-06-17 09:06:46 +0000
commite772b82d0bec65843a97c3916a8cfa63c12ee222 (patch)
treeb7205570d9c547e754ee1c7dc3bf7b342ce6388f /Makefile
parent6061beeb704135869efb84738db3f15ddce6afe9 (diff)
downloadFreeBSD-src-e772b82d0bec65843a97c3916a8cfa63c12ee222.zip
FreeBSD-src-e772b82d0bec65843a97c3916a8cfa63c12ee222.tar.gz
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
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
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`"
OpenPOWER on IntegriCloud