ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/src/trunk/Makefile
(Generate patch)

Comparing trunk/Makefile (file contents):
Revision 8512 by laffer1, Sun Sep 18 22:54:30 2016 UTC vs.
Revision 9188 by laffer1, Mon Oct 17 13:01:53 2016 UTC

# Line 276 | Line 276 | kernel: buildkernel installkernel
276   # for building the world.
277   #
278   upgrade_checks:
279 + .if !defined(.PARSEDIR)
280          @if ! (cd ${.CURDIR}/tools/build/make_check && \
281              PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \
282              PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \
283          then \
284              (cd ${.CURDIR} && ${MAKE} make); \
285          fi
286 + .endif
287  
288   #
289   # Upgrade make(1) to the current version using the installed
# Line 348 | Line 350 | MAKEFAIL=tee -a ${FAILFILE}
350   MAKEFAIL=cat
351   .endif
352  
353 < universe: universe_prologue
353 > universe: universe_prologue upgrade_checks
354   universe_prologue:
355          @echo "--------------------------------------------------------------"
356          @echo ">>> make universe started on ${STARTTIME}"
# Line 358 | Line 360 | universe_prologue:
360   .endif
361   .for target in ${TARGETS}
362   universe: universe_${target}
363 < .ORDER: universe_prologue universe_${target} universe_epilogue
363 > .ORDER: universe_prologue upgrade_checks universe_${target}_prologue universe_${target} universe_epilogue
364   universe_${target}: universe_${target}_prologue
365   universe_${target}_prologue:
366          @echo ">> ${target} started on `LC_ALL=C date`"

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines