aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2015-06-16 17:55:20 +0000
committerWarner Losh <imp@FreeBSD.org>2015-06-16 17:55:20 +0000
commit35c9a2a9a178157ba7f22db4f44d28f1f81db177 (patch)
treea695d6a2a8a0959a6517a26083d870c4e224300b
parent6cdaf31e2a8d576df770020794290396d0f1b01a (diff)
downloadsrc-35c9a2a9a178157ba7f22db4f44d28f1f81db177.tar.gz
src-35c9a2a9a178157ba7f22db4f44d28f1f81db177.zip
A more compatible fix to MK_META_MODE not being defined. Also, encase
bmake specific constructs not needed for make bootstrap so fmake doesn't see them. This works with fmake just well enough for us to build bmake to build the rest of the tree without fatal errors. Tested only with fmake package.
Notes
Notes: svn path=/head/; revision=284454
-rw-r--r--Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index be1ee45a4159..4287ac9cc6e9 100644
--- a/Makefile
+++ b/Makefile
@@ -99,7 +99,10 @@
#
# For more information, see the build(7) manual page.
#
-.if ${MK_META_MODE:Uno} == "yes"
+
+# Note: we use this awkward construct to be compatible with FreeBSD's
+# old make used in 10.0 and 9.2 and earlier.
+.if defined(MK_META_MODE) && ${MK_META_MODE} == "yes"
# targets/Makefile plays the role of top-level
.include "targets/Makefile"
.else
@@ -522,6 +525,7 @@ universe_epilogue:
buildLINT:
${MAKE} -C ${.CURDIR}/sys/${_TARGET}/conf LINT
+.if defined(.PARSEDIR)
# This makefile does not run in meta mode
.MAKE.MODE= normal
# Normally the things we run from here don't either.
@@ -539,5 +543,6 @@ UPDATE_DEPENDFILE= NO
MAKE_JOB_ERROR_TOKEN= no
.export MAKE_JOB_ERROR_TOKEN
.endif
+.endif # bmake
.endif # META_MODE