mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-06 17:18:32 +00:00
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.
This commit is contained in:
parent
6cdaf31e2a
commit
35c9a2a9a1
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=284454
7
Makefile
7
Makefile
|
@ -99,7 +99,10 @@
|
||||||
#
|
#
|
||||||
# For more information, see the build(7) manual page.
|
# 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
|
# targets/Makefile plays the role of top-level
|
||||||
.include "targets/Makefile"
|
.include "targets/Makefile"
|
||||||
.else
|
.else
|
||||||
|
@ -522,6 +525,7 @@ universe_epilogue:
|
||||||
buildLINT:
|
buildLINT:
|
||||||
${MAKE} -C ${.CURDIR}/sys/${_TARGET}/conf LINT
|
${MAKE} -C ${.CURDIR}/sys/${_TARGET}/conf LINT
|
||||||
|
|
||||||
|
.if defined(.PARSEDIR)
|
||||||
# This makefile does not run in meta mode
|
# This makefile does not run in meta mode
|
||||||
.MAKE.MODE= normal
|
.MAKE.MODE= normal
|
||||||
# Normally the things we run from here don't either.
|
# Normally the things we run from here don't either.
|
||||||
|
@ -539,5 +543,6 @@ UPDATE_DEPENDFILE= NO
|
||||||
MAKE_JOB_ERROR_TOKEN= no
|
MAKE_JOB_ERROR_TOKEN= no
|
||||||
.export MAKE_JOB_ERROR_TOKEN
|
.export MAKE_JOB_ERROR_TOKEN
|
||||||
.endif
|
.endif
|
||||||
|
.endif # bmake
|
||||||
|
|
||||||
.endif # META_MODE
|
.endif # META_MODE
|
||||||
|
|
Loading…
Reference in a new issue