diff options
author | bdrewery <bdrewery@FreeBSD.org> | 2016-05-09 22:21:09 +0000 |
---|---|---|
committer | bdrewery <bdrewery@FreeBSD.org> | 2016-05-09 22:21:09 +0000 |
commit | ed7b2996620412b29e7a0fb776028c92df0228ee (patch) | |
tree | c99a235e70fb0021c4252bc6a884b8488c0449e2 /share | |
parent | 046391d49f5259a6413733ec6912669cc0c3f72b (diff) | |
download | FreeBSD-src-ed7b2996620412b29e7a0fb776028c92df0228ee.zip FreeBSD-src-ed7b2996620412b29e7a0fb776028c92df0228ee.tar.gz |
DIRDEPS_BUILD: Run the staged bootstrap-tools version of build-tools.
This avoids running target binaries.
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'share')
-rw-r--r-- | share/mk/local.meta.sys.mk | 2 | ||||
-rw-r--r-- | share/syscons/scrnmaps/Makefile | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/share/mk/local.meta.sys.mk b/share/mk/local.meta.sys.mk index e55d68d..6088c75 100644 --- a/share/mk/local.meta.sys.mk +++ b/share/mk/local.meta.sys.mk @@ -232,6 +232,8 @@ TOOLSDIR?= ${HOST_OBJTOP}/tools .elif defined(STAGE_HOST_OBJTOP) TOOLSDIR?= ${STAGE_HOST_OBJTOP} .endif +BTOOLSPATH= ${HOST_OBJTOP}/tools${.CURDIR} + # Don't use the bootstrap tools logic on itself. .if ${.TARGETS:Mbootstrap-tools} == "" && \ !make(showconfig) && \ diff --git a/share/syscons/scrnmaps/Makefile b/share/syscons/scrnmaps/Makefile index 1e14e50..1a082a5 100644 --- a/share/syscons/scrnmaps/Makefile +++ b/share/syscons/scrnmaps/Makefile @@ -15,7 +15,7 @@ FILESDIR= ${SHAREDIR}/syscons/scrnmaps build-tools: ${SCRMAPS_MK} ${SCRMAPS}: ${.TARGET:R}.mk - ./${.TARGET:R}.mk ${.TARGET:R}.tmp + ${BTOOLSPATH:U.}/${.TARGET:R}.mk ${.TARGET:R}.tmp uuencode ${.TARGET:R}.tmp ${.TARGET:R} > ${.TARGET} rm -f ${.TARGET:R}.tmp |