svn commit: r202483 - stable/6
Bjoern A. Zeeb
bz at FreeBSD.org
Sun Jan 17 13:49:18 UTC 2010
Author: bz
Date: Sun Jan 17 13:49:18 2010
New Revision: 202483
URL: http://svn.freebsd.org/changeset/base/202483
Log:
Backup this part of r202479 which was not meant to be committed along with
the merge of r201898.
Modified:
stable/6/Makefile (contents, props changed)
Modified: stable/6/Makefile
==============================================================================
--- stable/6/Makefile Sun Jan 17 13:45:33 2010 (r202482)
+++ stable/6/Makefile Sun Jan 17 13:49:18 2010 (r202483)
@@ -262,14 +262,12 @@ make: .PHONY
# existing system is.
#
.if make(universe)
-TARGETS?=alpha amd64 i386 ia64 pc98 powerpc sparc64
-
universe: universe_prologue
universe_prologue:
@echo "--------------------------------------------------------------"
@echo ">>> make universe started on ${STARTTIME}"
@echo "--------------------------------------------------------------"
-.for target in ${TARGETS}
+.for target in alpha amd64 i386 ia64 pc98 powerpc sparc64
KERNCONFS!= cd ${.CURDIR}/sys/${target}/conf && \
find [A-Z]*[A-Z] -type f -maxdepth 0 \
! -name DEFAULTS ! -name LINT
@@ -277,30 +275,22 @@ KERNCONFS:= ${KERNCONFS:S/^NOTES$/LINT/}
universe: universe_${target}
.ORDER: universe_prologue universe_${target} universe_epilogue
universe_${target}:
-.if !defined(MAKE_JUST_KERNELS)
@echo ">> ${target} started on `LC_ALL=C date`"
- @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
- ${MAKE} ${JFLAG} buildworld \
+ -cd ${.CURDIR} && ${MAKE} ${JFLAG} buildworld \
TARGET=${target} \
- > _.${target}.buildworld 2>&1 || \
- echo "${target} world failed," \
- "check _.${target}.buildworld for details")
+ __MAKE_CONF=/dev/null \
+ > _.${target}.buildworld 2>&1
@echo ">> ${target} buildworld completed on `LC_ALL=C date`"
-.endif
.if exists(${.CURDIR}/sys/${target}/conf/NOTES)
- @(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")
+ -cd ${.CURDIR}/sys/${target}/conf && ${MAKE} LINT \
+ > ${.CURDIR}/_.${target}.makeLINT 2>&1
.endif
.for kernel in ${KERNCONFS}
- @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
- ${MAKE} ${JFLAG} buildkernel \
+ -cd ${.CURDIR} && ${MAKE} ${JFLAG} buildkernel \
TARGET=${target} \
KERNCONF=${kernel} \
- > _.${target}.${kernel} 2>&1 || \
- echo "${target} ${kernel} kernel failed," \
- "check _.${target}.${kernel} for details")
+ __MAKE_CONF=/dev/null \
+ > _.${target}.${kernel} 2>&1
.endfor
@echo ">> ${target} completed on `LC_ALL=C date`"
.endfor
More information about the svn-src-stable
mailing list