d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Since sys.mk now handles META_MODE and META_FILES options

Browse Source 
we need not worry about them here.
Checking for .PARSEDIR no longer needed.
This commit is contained in:
Simon J. Gerraty 2015-06-10 13:08:45 +00:00
parent ee10d8d237
commit 1fc3d968ac
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile
View File

@ -521,26 +521,22 @@ 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.
# Using -DWITH_META_FILES -DWITHOUT_STAGING # Using -DWITH_META_FILES
# we can buildworld with meta files created which are useful # we can buildworld with meta files created which are useful
# for debugging, but without any of the rest of a meta mode build. # for debugging, but without any of the rest of a meta mode build.
.ifndef WITH_META_FILES MK_META_MODE= no
WITHOUT_META_MODE= MK_STAGING= no
.export WITHOUT_META_MODE # tell meta.autodep.mk to not even think about updating anything.
.else UPDATE_DEPENDFILE= NO
WITHOUT_STAGING= .export MK_META_MODE MK_STAGING UPDATE_DEPENDFILE
UPDATE_DEPENDFILE=NO
.export UPDATE_DEPENDFILE WITHOUT_STAGING
.endif
.if make(universe) .if make(universe)
# we do not want a failure of one branch abort all. # we do not want a failure of one branch abort all.
MAKE_JOB_ERROR_TOKEN= no MAKE_JOB_ERROR_TOKEN= no
.export MAKE_JOB_ERROR_TOKEN .export MAKE_JOB_ERROR_TOKEN
.endif .endif
.endif
.endif .endif # META_MODE