Prefer bootstrapped tools when running certctl.sh

Otherwise we get lots of warnings when building on Linux/macOS during
installworld:
Scanning /local/scratch/alr48/cheri/output/freebsd-x86/usr/share/certs/blacklisted for certificates...
install: invalid option -- 'U'
Try 'install --help' for more information.
install: invalid option -- 'U'
....

Reviewed By:	kevans
Differential Revision: https://reviews.freebsd.org/D26481
This commit is contained in:
Alex Richardson 2020-09-21 09:03:32 +00:00
parent e307eb94ae
commit 6129f33eb2

View File

@ -1451,7 +1451,7 @@ distributeworld installworld stageworld: _installcheck_world .PHONY
.endif # make(distributeworld) .endif # make(distributeworld)
.if !make(packageworld) && ${MK_CAROOT} != "no" .if !make(packageworld) && ${MK_CAROOT} != "no"
@if which openssl>/dev/null; then \ @if which openssl>/dev/null; then \
DESTDIR=${CERTCTLDESTDIR} \ DESTDIR=${CERTCTLDESTDIR} PATH=${TMPPATH}:${PATH} \
sh ${SRCTOP}/usr.sbin/certctl/certctl.sh ${CERTCTLFLAGS} rehash \ sh ${SRCTOP}/usr.sbin/certctl/certctl.sh ${CERTCTLFLAGS} rehash \
else \ else \
echo "No openssl on the host, not rehashing certificates target -- /etc/ssl may not be populated."; \ echo "No openssl on the host, not rehashing certificates target -- /etc/ssl may not be populated."; \