Date: Sat, 19 Oct 2019 07:16:21 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r353749 - head Message-ID: <201910190716.x9J7GL03058824@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Sat Oct 19 07:16:20 2019 New Revision: 353749 URL: https://svnweb.freebsd.org/changeset/base/353749 Log: buildkernel: always add standard kernel configuration include path This should change nothing for kernel configurations at the standard locations in the source tree. However, if KERNCONFDIR is used to specify a custom location for a kernel configuration file (e.g., out of tree), then both the custom location and the standard location, in this order, will be used as include paths for config(8). This will allow the kernel configuration to include files from both locations. Reviewed by: bdrewery MFC after: 16 days Differential Revision: https://reviews.freebsd.org/D22057 Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sat Oct 19 07:13:15 2019 (r353748) +++ head/Makefile.inc1 Sat Oct 19 07:16:20 2019 (r353749) @@ -1653,7 +1653,8 @@ buildkernel: .MAKE .PHONY cd ${KRNLCONFDIR}; \ PATH=${TMPPATH} \ config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} \ - -I '${KERNCONFDIR}' '${KERNCONFDIR}/${_kernel}' + -I '${KERNCONFDIR}' -I '${KRNLCONFDIR}' \ + '${KERNCONFDIR}/${_kernel}' .endif .if !defined(NO_CLEAN) && !defined(NO_KERNELCLEAN) @echo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910190716.x9J7GL03058824>