Deleted Added
full compact
Makefile (297035) Makefile (301738)
1#
1#
2# $FreeBSD: stable/10/Makefile 297035 2016-03-18 18:24:36Z bdrewery $
2# $FreeBSD: stable/10/Makefile 301738 2016-06-09 15:43:00Z bdrewery $
3#
4# The user-driven targets are:
5#
6# universe - *Really* build *everything* (buildworld and
7# all kernels on all architectures).
8# tinderbox - Same as universe, but presents a list of failed build
9# targets and exits with an error if there were any.
10# buildworld - Rebuild *everything*, including glue to help do

--- 139 unchanged lines hidden (view full) ---

150WANT_MAKE= fmake
151.endif
152MYMAKE= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}/${WANT_MAKE}
153.if defined(.PARSEDIR)
154HAVE_MAKE= bmake
155.else
156HAVE_MAKE= fmake
157.endif
3#
4# The user-driven targets are:
5#
6# universe - *Really* build *everything* (buildworld and
7# all kernels on all architectures).
8# tinderbox - Same as universe, but presents a list of failed build
9# targets and exits with an error if there were any.
10# buildworld - Rebuild *everything*, including glue to help do

--- 139 unchanged lines hidden (view full) ---

150WANT_MAKE= fmake
151.endif
152MYMAKE= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}/${WANT_MAKE}
153.if defined(.PARSEDIR)
154HAVE_MAKE= bmake
155.else
156HAVE_MAKE= fmake
157.endif
158.if ${HAVE_MAKE} != ${WANT_MAKE} || \
159 (defined(WANT_MAKE_VERSION) && ${MAKE_VERSION} < ${WANT_MAKE_VERSION})
160NEED_MAKE_UPGRADE= t
161.endif
158.if exists(${MYMAKE})
159SUB_MAKE:= ${MYMAKE} -m ${.CURDIR}/share/mk
162.if exists(${MYMAKE})
163SUB_MAKE:= ${MYMAKE} -m ${.CURDIR}/share/mk
160.elif ${WANT_MAKE} != ${HAVE_MAKE} || ${WANT_MAKE} != "bmake"
164.elif defined(NEED_MAKE_UPGRADE) || ${WANT_MAKE} != "bmake"
161# It may not exist yet but we may cause it to.
162# In the case of fmake, upgrade_checks may cause a newer version to be built.
163SUB_MAKE= `test -x ${MYMAKE} && echo ${MYMAKE} || echo ${MAKE}` \
164 -m ${.CURDIR}/share/mk
165.else
166SUB_MAKE= ${MAKE} -m ${.CURDIR}/share/mk
167.endif
168

--- 160 unchanged lines hidden (view full) ---

329#
330kernel: buildkernel installkernel
331
332#
333# Perform a few tests to determine if the installed tools are adequate
334# for building the world.
335#
336upgrade_checks:
165# It may not exist yet but we may cause it to.
166# In the case of fmake, upgrade_checks may cause a newer version to be built.
167SUB_MAKE= `test -x ${MYMAKE} && echo ${MYMAKE} || echo ${MAKE}` \
168 -m ${.CURDIR}/share/mk
169.else
170SUB_MAKE= ${MAKE} -m ${.CURDIR}/share/mk
171.endif
172

--- 160 unchanged lines hidden (view full) ---

333#
334kernel: buildkernel installkernel
335
336#
337# Perform a few tests to determine if the installed tools are adequate
338# for building the world.
339#
340upgrade_checks:
337.if ${HAVE_MAKE} != ${WANT_MAKE} || \
338 (defined(WANT_MAKE_VERSION) && ${MAKE_VERSION} < ${WANT_MAKE_VERSION})
341.if defined(NEED_MAKE_UPGRADE)
339 @${_+_}(cd ${.CURDIR} && ${MAKE} ${WANT_MAKE:S,^f,,})
340.elif ${WANT_MAKE} == "fmake"
341 @if ! (cd ${.CURDIR}/tools/build/make_check && \
342 PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \
343 PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \
344 then \
345 (cd ${.CURDIR} && ${MAKE} make); \
346 fi

--- 186 unchanged lines hidden ---
342 @${_+_}(cd ${.CURDIR} && ${MAKE} ${WANT_MAKE:S,^f,,})
343.elif ${WANT_MAKE} == "fmake"
344 @if ! (cd ${.CURDIR}/tools/build/make_check && \
345 PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \
346 PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \
347 then \
348 (cd ${.CURDIR} && ${MAKE} make); \
349 fi

--- 186 unchanged lines hidden ---