From 6129f33eb2416b5573a780b7bba3e9a591cf690a Mon Sep 17 00:00:00 2001 From: Alex Richardson Date: Mon, 21 Sep 2020 09:03:32 +0000 Subject: [PATCH] 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 --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 20019573ea26..de4970efeef6 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1451,7 +1451,7 @@ distributeworld installworld stageworld: _installcheck_world .PHONY .endif # make(distributeworld) .if !make(packageworld) && ${MK_CAROOT} != "no" @if which openssl>/dev/null; then \ - DESTDIR=${CERTCTLDESTDIR} \ + DESTDIR=${CERTCTLDESTDIR} PATH=${TMPPATH}:${PATH} \ sh ${SRCTOP}/usr.sbin/certctl/certctl.sh ${CERTCTLFLAGS} rehash \ else \ echo "No openssl on the host, not rehashing certificates target -- /etc/ssl may not be populated."; \