diff options
author | bdrewery <bdrewery@FreeBSD.org> | 2016-05-21 01:31:44 +0000 |
---|---|---|
committer | bdrewery <bdrewery@FreeBSD.org> | 2016-05-21 01:31:44 +0000 |
commit | dc0746193c024a5345c8b63d045686cff9ffd1d0 (patch) | |
tree | 1c4ec47059a7a8046543cc6044aee2c3da646f1d /share | |
parent | 31ed371ae87a992ec9cef2beb358bc55ea5074b6 (diff) | |
download | FreeBSD-src-dc0746193c024a5345c8b63d045686cff9ffd1d0.zip FreeBSD-src-dc0746193c024a5345c8b63d045686cff9ffd1d0.tar.gz |
WITH_DIRDEPS_BUILD: Fix forcing user to run bootstrap-tools.
This is a follow-up to r299289. If the user did not run bootstrap-tools
for this directory then just build the tool as normal. It assumes that
TARGET == MACHINE, but that was already the case before r299289.
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'share')
-rw-r--r-- | share/mk/local.meta.sys.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/share/mk/local.meta.sys.mk b/share/mk/local.meta.sys.mk index 55febe0..2c69a64 100644 --- a/share/mk/local.meta.sys.mk +++ b/share/mk/local.meta.sys.mk @@ -232,7 +232,12 @@ TOOLSDIR?= ${HOST_OBJTOP}/tools .elif defined(STAGE_HOST_OBJTOP) TOOLSDIR?= ${STAGE_HOST_OBJTOP} .endif +# Only define if it exists in case user didn't run bootstrap-tools. Otherwise +# the tool will be built during the build. Building it assumes it is +# TARGET==MACHINE. +.if exists(${HOST_OBJTOP}/tools${.CURDIR}) BTOOLSPATH= ${HOST_OBJTOP}/tools${.CURDIR} +.endif # Don't use the bootstrap tools logic on itself. .if ${.TARGETS:Mbootstrap-tools} == "" && \ |