Deleted Added
full compact
Makefile (249316) Makefile (249395)
1#
1#
2# $FreeBSD: head/Makefile 249316 2013-04-09 20:21:35Z dim $
2# $FreeBSD: head/Makefile 249395 2013-04-12 00:34:19Z sjg $
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

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

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)
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

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

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)
284.if defined(WITH_BMAKE)
285 (cd ${.CURDIR} && ${MAKE} bmake)
286.else
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
287 @if ! (cd ${.CURDIR}/tools/build/make_check && \
288 PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \
289 PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \
290 then \
291 (cd ${.CURDIR} && ${MAKE} make); \
292 fi
293.endif
294.endif
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= \
299 INSTALL="sh ${.CURDIR}/tools/install.sh"
300MMAKE= ${MMAKEENV} ${MAKE} \
301 -D_UPGRADING \
302 -DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \
303 -DNO_CPU_CFLAGS -DNO_WERROR
304
295
296#
297# Upgrade make(1) to the current version using the installed
298# headers, libraries and tools. Also, allow the location of
299# the system bsdmake-like utility to be overridden.
300#
301MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \
302 DESTDIR= \
303 INSTALL="sh ${.CURDIR}/tools/install.sh"
304MMAKE= ${MMAKEENV} ${MAKE} \
305 -D_UPGRADING \
306 -DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \
307 -DNO_CPU_CFLAGS -DNO_WERROR
308
305make: .PHONY
309make bmake: .PHONY
306 @echo
307 @echo "--------------------------------------------------------------"
308 @echo ">>> Building an up-to-date make(1)"
309 @echo "--------------------------------------------------------------"
310 @echo
311 @echo "--------------------------------------------------------------"
312 @echo ">>> Building an up-to-date make(1)"
313 @echo "--------------------------------------------------------------"
310 ${_+_}@cd ${.CURDIR}/usr.bin/make; \
314 ${_+_}@cd ${.CURDIR}/usr.bin/${.TARGET}; \
311 ${MMAKE} obj && \
312 ${MMAKE} depend && \
313 ${MMAKE} all && \
314 ${MMAKE} install DESTDIR=${MAKEPATH} BINDIR=
315
316tinderbox:
317 @cd ${.CURDIR} && ${MAKE} DOING_TINDERBOX=YES universe
318

--- 138 unchanged lines hidden ---
315 ${MMAKE} obj && \
316 ${MMAKE} depend && \
317 ${MMAKE} all && \
318 ${MMAKE} install DESTDIR=${MAKEPATH} BINDIR=
319
320tinderbox:
321 @cd ${.CURDIR} && ${MAKE} DOING_TINDERBOX=YES universe
322

--- 138 unchanged lines hidden ---