aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMarcel Moolenaar <marcel@FreeBSD.org>2012-10-06 20:01:05 +0000
committerMarcel Moolenaar <marcel@FreeBSD.org>2012-10-06 20:01:05 +0000
commit0815243c3937b61db8b5a10cc652900d4df4acb0 (patch)
tree70de730ba0fbf9e81dd585c1575a057d03a31be8 /Makefile
parent8bf749ef3a7a8c46811f68c985612e84501d23a0 (diff)
downloadsrc-0815243c3937b61db8b5a10cc652900d4df4acb0.tar.gz
src-0815243c3937b61db8b5a10cc652900d4df4acb0.zip
Add support for bmake. This includes:
1. Don't do upgrade_checks when using bmake. As long as we have WITH_BMAKE, there's a bootstrap complication in ths respect. Avoid it. Make the necessary changes to have upgrade_checks work wth bmake anyway. 2. Remove the use of -E. It's not needed in our build because we use ?= for the respective variables, which means that we'll take the environment value (if any) anyway. 3. Properly declare phony targets as phony as bmake is a lot smarter (and thus agressive) about build avoidance. 4. Make sure CLEANFILES is complete and use it on .NOPATH. bmake is a lot smarter about build avoidance and should not find files we generate in the source tree. We should not have files in the repository we want to generate, but this is an easier way to cross this hurdle. 5. Have behavior under bmake the same as it is under make with respect to halting when sub-commands fail. Add "set -e" to compound commands so that bmake is informed when sub-commands fail. 6. Make sure crunchgen uses the same make as the rest of the build. This is important when the make utility isn't called make (but bmake for example). 7. While here, add support for using MAKEOBJDIR to set the object tree location. It's the second alternative bmake looks for when determining the actual object directory (= .OBJDIR). Submitted by: Simon Gerraty <sjg@juniper.net> Submitted by: John Van Horne <jvanhorne@juniper.net>
Notes
Notes: svn path=/head/; revision=241298
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 1303e0ea18bd..6d070ee8417b 100644
--- a/Makefile
+++ b/Makefile
@@ -280,12 +280,14 @@ kernel: buildkernel installkernel
# for building the world.
#
upgrade_checks:
+.if !defined(.PARSEDIR)
@if ! (cd ${.CURDIR}/tools/build/make_check && \
PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \
PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \
then \
(cd ${.CURDIR} && ${MAKE} make); \
fi
+.endif
#
# Upgrade make(1) to the current version using the installed