From 01a69565d87ee96286b00124b8e0b56a5445e48e Mon Sep 17 00:00:00 2001 From: Andriy Gapon Date: Sat, 19 Oct 2019 07:16:20 +0000 Subject: [PATCH] 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 --- Makefile.inc1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 8eb85f0e12dd..dce33b57463c 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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