Date: Sat, 21 May 2016 01:31:45 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r300342 - head/share/mk Message-ID: <201605210131.u4L1VjHv032865@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Sat May 21 01:31:44 2016 New Revision: 300342 URL: https://svnweb.freebsd.org/changeset/base/300342 Log: 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 Modified: head/share/mk/local.meta.sys.mk Modified: head/share/mk/local.meta.sys.mk ============================================================================== --- head/share/mk/local.meta.sys.mk Sat May 21 01:31:41 2016 (r300341) +++ head/share/mk/local.meta.sys.mk Sat May 21 01:31:44 2016 (r300342) @@ -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} == "" && \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605210131.u4L1VjHv032865>