Deleted Added
full compact
Makefile (296748) Makefile (297035)
1#
1#
2# $FreeBSD: stable/10/Makefile 296748 2016-03-12 19:02:20Z bdrewery $
2# $FreeBSD: stable/10/Makefile 297035 2016-03-18 18:24:36Z 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

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

331
332#
333# Perform a few tests to determine if the installed tools are adequate
334# for building the world.
335#
336upgrade_checks:
337.if ${HAVE_MAKE} != ${WANT_MAKE} || \
338 (defined(WANT_MAKE_VERSION) && ${MAKE_VERSION} < ${WANT_MAKE_VERSION})
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

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

331
332#
333# Perform a few tests to determine if the installed tools are adequate
334# for building the world.
335#
336upgrade_checks:
337.if ${HAVE_MAKE} != ${WANT_MAKE} || \
338 (defined(WANT_MAKE_VERSION) && ${MAKE_VERSION} < ${WANT_MAKE_VERSION})
339 @(cd ${.CURDIR} && ${MAKE} ${WANT_MAKE:S,^f,,})
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
347.endif

--- 185 unchanged lines hidden ---
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
347.endif

--- 185 unchanged lines hidden ---