svn commit: r365939 - head

[Alex Richardson]

Author: arichardson
Date: Mon Sep 21 09:03:32 2020
New Revision: 365939
URL: https://svnweb.freebsd.org/changeset/base/365939

Log:
  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

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Mon Sep 21 09:01:10 2020	(r365938)
+++ head/Makefile.inc1	Mon Sep 21 09:03:32 2020	(r365939)
@@ -1451,7 +1451,7 @@ distributeworld installworld stageworld: _installcheck
 .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."; \