In "make universe", utilize simplified cross-build synopsis,

"make TARGET=<machine> build*", now that it actually works.

Prompted by:	imp
This commit is contained in:
Ruslan Ermilov 2006-09-08 10:13:15 +00:00
parent 89edd7e555
commit 1fde59f3de

View File

@ -58,8 +58,8 @@
# #
# See src/UPDATING `COMMON ITEMS' for more complete information. # See src/UPDATING `COMMON ITEMS' for more complete information.
# #
# If TARGET_ARCH=arch (e.g. ia64, sparc64, ...) is specified you can # If TARGET=machine (e.g. ia64, sparc64, ...) is specified you can
# cross build world for other architectures using the buildworld target, # cross build world for other machine types using the buildworld target,
# and once the world is built you can cross build a kernel using the # and once the world is built you can cross build a kernel using the
# buildkernel target. # buildkernel target.
# #
@ -266,36 +266,32 @@ universe_prologue:
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
@echo ">>> make universe started on ${STARTTIME}" @echo ">>> make universe started on ${STARTTIME}"
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
.for target in i386 i386:pc98 sparc64 ia64 amd64 .for target in amd64 i386 ia64 pc98 sparc64
.for arch in ${target:C/:.*$//} KERNCONFS!= cd ${.CURDIR}/sys/${target}/conf && \
.for mach in ${target:C/^.*://}
KERNCONFS!= cd ${.CURDIR}/sys/${mach}/conf && \
find [A-Z]*[A-Z] -type f -maxdepth 0 \ find [A-Z]*[A-Z] -type f -maxdepth 0 \
! -name DEFAULTS ! -name LINT ! -name DEFAULTS ! -name LINT
KERNCONFS:= ${KERNCONFS:S/^NOTES$/LINT/} KERNCONFS:= ${KERNCONFS:S/^NOTES$/LINT/}
universe: universe_${mach} universe: universe_${target}
.ORDER: universe_prologue universe_${mach} universe_epilogue .ORDER: universe_prologue universe_${target} universe_epilogue
universe_${mach}: universe_${target}:
@echo ">> ${mach} started on `LC_ALL=C date`" @echo ">> ${target} started on `LC_ALL=C date`"
-cd ${.CURDIR} && ${MAKE} ${JFLAG} buildworld \ -cd ${.CURDIR} && ${MAKE} ${JFLAG} buildworld \
TARGET_ARCH=${arch} TARGET=${mach} \ TARGET=${target} \
__MAKE_CONF=/dev/null \ __MAKE_CONF=/dev/null \
> _.${mach}.buildworld 2>&1 > _.${target}.buildworld 2>&1
@echo ">> ${mach} buildworld completed on `LC_ALL=C date`" @echo ">> ${target} buildworld completed on `LC_ALL=C date`"
.if exists(${.CURDIR}/sys/${mach}/conf/NOTES) .if exists(${.CURDIR}/sys/${target}/conf/NOTES)
-cd ${.CURDIR}/sys/${mach}/conf && ${MAKE} LINT \ -cd ${.CURDIR}/sys/${target}/conf && ${MAKE} LINT \
> ${.CURDIR}/_.${mach}.makeLINT 2>&1 > ${.CURDIR}/_.${target}.makeLINT 2>&1
.endif .endif
.for kernel in ${KERNCONFS} .for kernel in ${KERNCONFS}
-cd ${.CURDIR} && ${MAKE} ${JFLAG} buildkernel \ -cd ${.CURDIR} && ${MAKE} ${JFLAG} buildkernel \
TARGET_ARCH=${arch} TARGET=${mach} \ TARGET=${target} \
KERNCONF=${kernel} \ KERNCONF=${kernel} \
__MAKE_CONF=/dev/null \ __MAKE_CONF=/dev/null \
> _.${mach}.${kernel} 2>&1 > _.${target}.${kernel} 2>&1
.endfor
@echo ">> ${mach} completed on `LC_ALL=C date`"
.endfor
.endfor .endfor
@echo ">> ${target} completed on `LC_ALL=C date`"
.endfor .endfor
universe: universe_epilogue universe: universe_epilogue
universe_epilogue: universe_epilogue: