Deleted Added
full compact
Makefile (240403) Makefile (241298)
1#
1#
2# $FreeBSD: head/Makefile 240403 2012-09-12 14:44:25Z obrien $
2# $FreeBSD: head/Makefile 241298 2012-10-06 20:01:05Z marcel $
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

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

275#
276kernel: buildkernel installkernel
277
278#
279# Perform a few tests to determine if the installed tools are adequate
280# for building the world.
281#
282upgrade_checks:
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

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

275#
276kernel: buildkernel installkernel
277
278#
279# Perform a few tests to determine if the installed tools are adequate
280# for building the world.
281#
282upgrade_checks:
283.if !defined(.PARSEDIR)
283 @if ! (cd ${.CURDIR}/tools/build/make_check && \
284 PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \
285 PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \
286 then \
287 (cd ${.CURDIR} && ${MAKE} make); \
288 fi
284 @if ! (cd ${.CURDIR}/tools/build/make_check && \
285 PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \
286 PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \
287 then \
288 (cd ${.CURDIR} && ${MAKE} make); \
289 fi
290.endif
289
290#
291# Upgrade make(1) to the current version using the installed
292# headers, libraries and tools. Also, allow the location of
293# the system bsdmake-like utility to be overridden.
294#
295MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \
296 DESTDIR= \

--- 147 unchanged lines hidden ---
291
292#
293# Upgrade make(1) to the current version using the installed
294# headers, libraries and tools. Also, allow the location of
295# the system bsdmake-like utility to be overridden.
296#
297MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \
298 DESTDIR= \

--- 147 unchanged lines hidden ---