diff options
| author | sjg <sjg@FreeBSD.org> | 2015-06-10 13:08:45 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2015-06-10 13:08:45 +0000 |
| commit | 167576cd473259db5d2c5e46606ae2965c9e55c7 (patch) | |
| tree | 90c5f7b2397b8cb761675ed8fbb9de1964d59d10 /Makefile | |
| parent | af99dd58fd7034a8c2c4e2e38bf4a1b4ff6af242 (diff) | |
| download | FreeBSD-src-167576cd473259db5d2c5e46606ae2965c9e55c7.zip FreeBSD-src-167576cd473259db5d2c5e46606ae2965c9e55c7.tar.gz | |
Since sys.mk now handles META_MODE and META_FILES options
we need not worry about them here.
Checking for .PARSEDIR no longer needed.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 20 |
1 files changed, 8 insertions, 12 deletions
@@ -521,26 +521,22 @@ 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. -# Using -DWITH_META_FILES -DWITHOUT_STAGING +# Using -DWITH_META_FILES # we can buildworld with meta files created which are useful # for debugging, but without any of the rest of a meta mode build. -.ifndef WITH_META_FILES -WITHOUT_META_MODE= -.export WITHOUT_META_MODE -.else -WITHOUT_STAGING= -UPDATE_DEPENDFILE=NO -.export UPDATE_DEPENDFILE WITHOUT_STAGING -.endif +MK_META_MODE= no +MK_STAGING= no +# tell meta.autodep.mk to not even think about updating anything. +UPDATE_DEPENDFILE= NO +.export MK_META_MODE MK_STAGING UPDATE_DEPENDFILE .if make(universe) # we do not want a failure of one branch abort all. MAKE_JOB_ERROR_TOKEN= no .export MAKE_JOB_ERROR_TOKEN .endif -.endif -.endif + +.endif # META_MODE |
