diff options
| author | sjg <sjg@FreeBSD.org> | 2013-08-16 16:26:23 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2013-08-16 16:26:23 +0000 |
| commit | 750a378414b03aa9eb44514b557d6b6cf97f660d (patch) | |
| tree | 456cc9d86ee9e893f08497d60075d6363c526215 /Makefile | |
| parent | 435f1b4a02f7e09f181b348afde0611c93d049a8 (diff) | |
| download | FreeBSD-src-750a378414b03aa9eb44514b557d6b6cf97f660d.zip FreeBSD-src-750a378414b03aa9eb44514b557d6b6cf97f660d.tar.gz | |
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
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 15 |
1 files changed, 9 insertions, 6 deletions
@@ -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_prologue .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_${target}_${target_arch} .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}/${TARGET}/conf && \ .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} \ |
