diff options
| author | sjg <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
| commit | d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2 (patch) | |
| tree | b04f4bd7cd887f50e7d98af35f46b9834ff86c80 /share/mk/local.sys.mk | |
| parent | 3c8e37b1d04827f33c0c9a7594bd1b1ef7cdb3d3 (diff) | |
| parent | 4fbde208c6460d576f64d6dc3cdc6cab085a4283 (diff) | |
| download | FreeBSD-src-d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2.zip FreeBSD-src-d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2.tar.gz | |
Merge head from 7/28
Diffstat (limited to 'share/mk/local.sys.mk')
| -rw-r--r-- | share/mk/local.sys.mk | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/share/mk/local.sys.mk b/share/mk/local.sys.mk index 8fe0195..2fe3d8f 100644 --- a/share/mk/local.sys.mk +++ b/share/mk/local.sys.mk @@ -1,6 +1,17 @@ WITH_INSTALL_AS_USER= yes .if defined(.PARSEDIR) # bmake +.if !defined(_TARGETS) +# some things we do only once +_TARGETS := ${.TARGETS} +.export _TARGETS +.endif +.if ${_TARGETS:Mbuildworld} +WITHOUT_STAGING= +WITHOUT_SYSROOT= +UPDATE_DEPENDFILE=NO +NO_AUTO_OBJ= +.endif SRCCONF:= ${.PARSEDIR}/src.conf # ensure we are self contained __MAKE_CONF:= ${SRCCONF} @@ -83,9 +94,8 @@ MACHINE_ARCH:= ${MACHINE_ARCH} MACHINE_ARCH:= ${MACHINE_ARCH.${MACHINE}} .endif -.if !defined(_TARGETS) -# some things we do only once -_TARGETS := ${.TARGETS} +.if ${.MAKE.LEVEL} == 0 +# 1st time only .-include <sys.env.mk> .if !empty(OBJROOT) .if ${OBJROOT:M*/} != "" @@ -160,6 +170,9 @@ MKOBJDIRS=auto .ifndef WITHOUT_META_MODE WITH_META_MODE= yes +.ifndef WITHOUT_SYSROOT +WITH_SYSROOT= yes +.endif .ifndef WITHOUT_STAGING WITH_STAGING= yes .ifndef WITHOUT_STAGING_PROG @@ -198,7 +211,7 @@ STAGE_ROOT?= ${OBJROOT}stage .endif .endif -.if !empty(STAGE_ROOT) +.if !empty(STAGE_ROOT) && !defined(WITHOUT_STAGING) .if ${MACHINE} == "host" STAGE_MACHINE= ${HOST_TARGET} .else @@ -225,10 +238,6 @@ STAGED_INCLUDE_DIR= ${STAGE_OBJTOP}/usr/include .endif .endif # EARLY_BUILD for host -.if ${USE_META:Uyes} == "yes" -.include "meta.sys.mk" -.endif - # this is sufficient for most of the tree. .MAKE.DEPENDFILE_DEFAULT = ${.MAKE.DEPENDFILE_PREFIX} @@ -241,6 +250,8 @@ STAGED_INCLUDE_DIR= ${STAGE_OBJTOP}/usr/include .include "sys.dependfile.mk" +.include "meta.sys.mk" + .if ${.MAKE.LEVEL} > 0 && ${MACHINE} == "host" && ${.MAKE.DEPENDFILE:E} != "host" # we can use this but should not update it. UPDATE_DEPENDFILE= NO |
