Deleted Added
full compact
Makefile (300119) Makefile (301465)
1#
1#
2# $FreeBSD: head/Makefile 300119 2016-05-18 06:01:18Z imp $
2# $FreeBSD: head/Makefile 301465 2016-06-05 23:04:15Z 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

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

165# 20160220 - support .dinclude for FAST_DEPEND.
166WANT_MAKE_VERSION= 20160220
167MYMAKE= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}/${WANT_MAKE}
168.if defined(.PARSEDIR)
169HAVE_MAKE= bmake
170.else
171HAVE_MAKE= fmake
172.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

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

165# 20160220 - support .dinclude for FAST_DEPEND.
166WANT_MAKE_VERSION= 20160220
167MYMAKE= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}/${WANT_MAKE}
168.if defined(.PARSEDIR)
169HAVE_MAKE= bmake
170.else
171HAVE_MAKE= fmake
172.endif
173.if ${HAVE_MAKE} != ${WANT_MAKE} || \
174 (defined(WANT_MAKE_VERSION) && ${MAKE_VERSION} < ${WANT_MAKE_VERSION})
175NEED_MAKE_UPGRADE= t
176.endif
173.if exists(${MYMAKE})
174SUB_MAKE:= ${MYMAKE} -m ${.CURDIR}/share/mk
177.if exists(${MYMAKE})
178SUB_MAKE:= ${MYMAKE} -m ${.CURDIR}/share/mk
175.elif ${WANT_MAKE} != ${HAVE_MAKE}
179.elif defined(NEED_MAKE_UPGRADE)
176# It may not exist yet but we may cause it to.
177# In the case of fmake, upgrade_checks may cause a newer version to be built.
178SUB_MAKE= `test -x ${MYMAKE} && echo ${MYMAKE} || echo ${MAKE}` \
179 -m ${.CURDIR}/share/mk
180.else
181SUB_MAKE= ${MAKE} -m ${.CURDIR}/share/mk
182.endif
183

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

308#
309kernel: buildkernel installkernel
310
311#
312# Perform a few tests to determine if the installed tools are adequate
313# for building the world.
314#
315upgrade_checks:
180# It may not exist yet but we may cause it to.
181# In the case of fmake, upgrade_checks may cause a newer version to be built.
182SUB_MAKE= `test -x ${MYMAKE} && echo ${MYMAKE} || echo ${MAKE}` \
183 -m ${.CURDIR}/share/mk
184.else
185SUB_MAKE= ${MAKE} -m ${.CURDIR}/share/mk
186.endif
187

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

312#
313kernel: buildkernel installkernel
314
315#
316# Perform a few tests to determine if the installed tools are adequate
317# for building the world.
318#
319upgrade_checks:
316.if ${HAVE_MAKE} != ${WANT_MAKE} || \
317 (defined(WANT_MAKE_VERSION) && ${MAKE_VERSION} < ${WANT_MAKE_VERSION})
320.if defined(NEED_MAKE_UPGRADE)
318 @${_+_}(cd ${.CURDIR} && ${MAKE} ${WANT_MAKE:S,^f,,})
319.endif
320
321#
322# Upgrade make(1) to the current version using the installed
323# headers, libraries and tools. Also, allow the location of
324# the system bsdmake-like utility to be overridden.
325#

--- 220 unchanged lines hidden ---
321 @${_+_}(cd ${.CURDIR} && ${MAKE} ${WANT_MAKE:S,^f,,})
322.endif
323
324#
325# Upgrade make(1) to the current version using the installed
326# headers, libraries and tools. Also, allow the location of
327# the system bsdmake-like utility to be overridden.
328#

--- 220 unchanged lines hidden ---