Skip to content

Commit

Permalink
WITH_DIRDEPS_BUILD: Fix forcing user to run bootstrap-tools.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bdrewery committed May 21, 2016
1 parent 31ed371 commit dc07461
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions share/mk/local.meta.sys.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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} == "" && \
Expand Down

0 comments on commit dc07461

Please sign in to comment.