d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makefile.inc1: push /usr/libexec into the BPATH/TMPPATH

Browse Source 
${WORLDTMP}/legacy/usr/libexec will only have libexec/ bits that we've
pushed as bootstrap tools, so this is generally safe to include prior to
PATH. The following are the ramifications of this change:

- BPATH addition gets us at least bootstrap flua in WMAKEENV path for
  buildenv, for those earlier systems where it's bootstrapped still

- Reworked the sysent target to just set PATH and let it get worked out in
  src.lua.mk or individual sysent makefiles -- this gives us back the
  ability to overwrite LUA_CMD and use a different/external lua for these
  targets.  sysent can also now work cleanly in buildenv.

- tools/build/Makefile will now symlink the host flua into build's host
  tools so that the above can work without needing to add the host's
  /usr/libexec explicitly into TMPPATH.

Reviewed by:	arichardson, brooks, imp (all slightly earlier version)
Differential Revision:	https://reviews.freebsd.org/D22464
This commit is contained in:
Kyle Evans 2020-01-12 04:18:36 +00:00
parent 89476f9c99
commit 4f47920e9c
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile.inc1
View File

@ -590,7 +590,7 @@ BUILD_ARCH!= uname -p
.endif .endif
.endif .endif
WORLDTMP?= ${OBJTOP}/tmp WORLDTMP?= ${OBJTOP}/tmp
BPATH= ${CCACHE_WRAPPER_PATH_PFX}${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/bin BPATH= ${CCACHE_WRAPPER_PATH_PFX}${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/bin:${WORLDTMP}/legacy/usr/libexec
XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin
# When building we want to find the cross tools before the host tools in ${BPATH}. # When building we want to find the cross tools before the host tools in ${BPATH}.
@ -1500,11 +1500,11 @@ makeman: .PHONY
${_+_}cd ${.CURDIR}/tools/build/options; sh makeman > \ ${_+_}cd ${.CURDIR}/tools/build/options; sh makeman > \
${.CURDIR}/share/man/man5/src.conf.5 ${.CURDIR}/share/man/man5/src.conf.5
.if make(sysent) # We can't assume here that ${TMPPATH} will include ${PATH} or /usr/libexec
.include <src.lua.mk> # because we may be building with a STRICTTMPPATH, so we explicitly include
.endif # /usr/libexec here for flua. ${TMPPATH} still usefully includes anything else
# we may need to function.
_sysent_PATH= ${WORLDTMP}/legacy/usr/libexec:/usr/libexec:${PATH} _sysent_PATH= ${TMPPATH}:/usr/libexec
_sysent_dirs= sys/kern _sysent_dirs= sys/kern
_sysent_dirs+= sys/compat/freebsd32 _sysent_dirs+= sys/compat/freebsd32
_sysent_dirs+= sys/compat/cloudabi32 \ _sysent_dirs+= sys/compat/cloudabi32 \
@ -1517,8 +1517,7 @@ _sysent_dirs+= sys/amd64/linux \
sysent: .PHONY sysent: .PHONY
.for _dir in ${_sysent_dirs} .for _dir in ${_sysent_dirs}
@echo "${MAKE} -C ${.CURDIR}/${_dir} sysent" @echo "${MAKE} -C ${.CURDIR}/${_dir} sysent"
${_+_}@env PATH=${_sysent_PATH} LUA=${LUA_CMD} \ ${_+_}@env PATH=${_sysent_PATH} ${MAKE} -C ${.CURDIR}/${_dir} sysent
${MAKE} -C ${.CURDIR}/${_dir} sysent
.endfor .endfor
# #

3
tools/build/Makefile
View File

@ -116,6 +116,9 @@ host-symlinks:
ln -sfnv "$${source_path}" "$${target_path}"; \ ln -sfnv "$${source_path}" "$${target_path}"; \
fi fi
.endfor .endfor
.if exists(/usr/libexec/flua)
ln -sf /usr/libexec/flua ${DESTDIR}/usr/libexec/flua
.endif
# Create all the directories that are needed during the legacy, bootstrap-tools # Create all the directories that are needed during the legacy, bootstrap-tools
# and cross-tools stages. We do this here using mkdir since mtree may not exist # and cross-tools stages. We do this here using mkdir since mtree may not exist