Page MenuHomeFreeBSD
Files F174247510

D22464.id66642.diff
No OneTemporary
Actions

D22464.id66642.diff
View Options

Index: head/Makefile.inc1
===================================================================
--- head/Makefile.inc1
+++ head/Makefile.inc1
@@ -590,7 +590,7 @@
.endif
.endif
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
# When building we want to find the cross tools before the host tools in ${BPATH}.
@@ -1500,11 +1500,11 @@
${_+_}cd ${.CURDIR}/tools/build/options; sh makeman > \
${.CURDIR}/share/man/man5/src.conf.5
-.if make(sysent)
-.include <src.lua.mk>
-.endif
-
-_sysent_PATH= ${WORLDTMP}/legacy/usr/libexec:/usr/libexec:${PATH}
+# We can't assume here that ${TMPPATH} will include ${PATH} or /usr/libexec
+# because we may be building with a STRICTTMPPATH, so we explicitly include
+# /usr/libexec here for flua. ${TMPPATH} still usefully includes anything else
+# we may need to function.
+_sysent_PATH= ${TMPPATH}:/usr/libexec
_sysent_dirs= sys/kern
_sysent_dirs+= sys/compat/freebsd32
_sysent_dirs+= sys/compat/cloudabi32 \
@@ -1517,8 +1517,7 @@
sysent: .PHONY
.for _dir in ${_sysent_dirs}
@echo "${MAKE} -C ${.CURDIR}/${_dir} sysent"
- ${_+_}@env PATH=${_sysent_PATH} LUA=${LUA_CMD} \
- ${MAKE} -C ${.CURDIR}/${_dir} sysent
+ ${_+_}@env PATH=${_sysent_PATH} ${MAKE} -C ${.CURDIR}/${_dir} sysent
.endfor
#
Index: head/tools/build/Makefile
===================================================================
--- head/tools/build/Makefile
+++ head/tools/build/Makefile
@@ -116,6 +116,9 @@
ln -sfnv "$${source_path}" "$${target_path}"; \
fi
.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
# and cross-tools stages. We do this here using mkdir since mtree may not exist

File Metadata

Mime Type
text/plain
Expires
Fri, Oct 2, 5:09 PM (2 h, 12 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40012372
Default Alt Text
D22464.id66642.diff (1 KB)

Event Timeline