svn commit: r254417 - head
Simon J. Gerraty
sjg at FreeBSD.org
Fri Aug 16 16:26:23 UTC 2013
Author: sjg
Date: Fri Aug 16 16:26:23 2013
New Revision: 254417
URL: http://svnweb.freebsd.org/changeset/base/254417
Log:
When we need to build using the in-tree make,
switch at the earliest opportunity.
In the case of fmake vs bmake, this helps ensure correct load handling.
Reviewed by: obrien
Modified:
head/Makefile
Modified: head/Makefile
==============================================================================
--- head/Makefile Fri Aug 16 16:14:32 2013 (r254416)
+++ head/Makefile Fri Aug 16 16:26:23 2013 (r254417)
@@ -242,6 +242,7 @@ cleanworld:
# skip this for -n to avoid changing previous behavior of
# 'make -n buildworld' etc.
${TGTS}: .MAKE
+tinderbox toolchains kernel-toolchains: .MAKE
.endif
${TGTS}:
@@ -353,14 +354,16 @@ make bmake: .PHONY
${MMAKE} all && \
${MMAKE} install DESTDIR=${MYMAKE:H} BINDIR= PROGNAME=${MYMAKE:T}
+tinderbox toolchains kernel-toolchains: upgrade_checks
+
tinderbox:
- @cd ${.CURDIR} && ${MAKE} DOING_TINDERBOX=YES universe
+ @cd ${.CURDIR} && ${SUB_MAKE} DOING_TINDERBOX=YES universe
toolchains:
- @cd ${.CURDIR} && ${MAKE} UNIVERSE_TARGET=toolchain universe
+ @cd ${.CURDIR} && ${SUB_MAKE} UNIVERSE_TARGET=toolchain universe
kernel-toolchains:
- @cd ${.CURDIR} && ${MAKE} UNIVERSE_TARGET=kernel-toolchain universe
+ @cd ${.CURDIR} && ${SUB_MAKE} UNIVERSE_TARGET=kernel-toolchain universe
#
# universe
@@ -419,7 +422,7 @@ universe_${target}_prologue: universe_pr
.if !defined(MAKE_JUST_KERNELS)
.for target_arch in ${TARGET_ARCHES_${target}}
universe_${target}: universe_${target}_${target_arch}
-universe_${target}_${target_arch}: universe_${target}_prologue
+universe_${target}_${target_arch}: universe_${target}_prologue .MAKE
@echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} started on `LC_ALL=C date`"
@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
${SUB_MAKE} ${JFLAG} ${UNIVERSE_TARGET} \
@@ -440,7 +443,7 @@ universe_${target}_kernels: universe_${t
.endfor
.endif
universe_${target}: universe_${target}_kernels
-universe_${target}_kernels: universe_${target}_prologue
+universe_${target}_kernels: universe_${target}_prologue .MAKE
.if exists(${KERNSRCDIR}/${target}/conf/NOTES)
@(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \
${SUB_MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \
@@ -468,7 +471,7 @@ TARGET_ARCH_${kernel}!= cd ${KERNSRCDIR}
.error "Target architecture for ${TARGET}/conf/${kernel} unknown. config(8) likely too old."
.endif
universe_kernconfs: universe_kernconf_${TARGET}_${kernel}
-universe_kernconf_${TARGET}_${kernel}:
+universe_kernconf_${TARGET}_${kernel}: .MAKE
@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
${SUB_MAKE} ${JFLAG} buildkernel \
TARGET=${TARGET} \
More information about the svn-src-head
mailing list