summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2008-11-24 11:23:14 +0000
committerdes <des@FreeBSD.org>2008-11-24 11:23:14 +0000
commit315e1d3a3c75f1cbbfafd3eb04035557b46b0fe6 (patch)
tree75a3cfb4fc6b57b2d7f65281df381a7bda47c259 /Makefile
parent87f4b6d4855f9eb3b80d6420463ac3a2509f5fc3 (diff)
downloadFreeBSD-src-315e1d3a3c75f1cbbfafd3eb04035557b46b0fe6.zip
FreeBSD-src-315e1d3a3c75f1cbbfafd3eb04035557b46b0fe6.tar.gz
Change the universe target to warn the user for every world or kernel that
fails. The error message includes a reference to the relevant log file. Approved by: phk MFC after: 1 week
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile22
1 files changed, 14 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 80838cc..03ca735 100644
--- a/Makefile
+++ b/Makefile
@@ -292,22 +292,28 @@ universe: universe_${target}
universe_${target}:
.if !defined(MAKE_JUST_KERNELS)
@echo ">> ${target} started on `LC_ALL=C date`"
- -cd ${.CURDIR} && ${MAKE} ${JFLAG} buildworld \
+ @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
+ ${MAKE} ${JFLAG} buildworld \
TARGET=${target} \
- __MAKE_CONF=/dev/null \
- > _.${target}.buildworld 2>&1
+ > _.${target}.buildworld 2>&1 || \
+ echo "${target} world failed," \
+ "check _.${target}.buildworld for details")
@echo ">> ${target} buildworld completed on `LC_ALL=C date`"
.endif
.if exists(${.CURDIR}/sys/${target}/conf/NOTES)
- -cd ${.CURDIR}/sys/${target}/conf && ${MAKE} LINT \
- > ${.CURDIR}/_.${target}.makeLINT 2>&1
+ @(cd ${.CURDIR}/sys/${target}/conf && env __MAKE_CONF=/dev/null \
+ ${MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \
+ echo "${target} 'make LINT' failed," \
+ "check _.${target}.makeLINT for details")
.endif
.for kernel in ${KERNCONFS}
- -cd ${.CURDIR} && ${MAKE} ${JFLAG} buildkernel \
+ @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
+ ${MAKE} ${JFLAG} buildkernel \
TARGET=${target} \
KERNCONF=${kernel} \
- __MAKE_CONF=/dev/null \
- > _.${target}.${kernel} 2>&1
+ > _.${target}.${kernel} 2>&1 || \
+ echo "${target} ${kernel} kernel failed," \
+ "check _.${target}.${kernel} for details")
.endfor
@echo ">> ${target} completed on `LC_ALL=C date`"
.endfor
OpenPOWER on IntegriCloud