d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buildkernel: always add standard kernel configuration include path

Browse Source 
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
This commit is contained in:
Andriy Gapon 2019-10-19 07:16:20 +00:00
parent 3aa8a8ed2d
commit 01a69565d8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.inc1
View File

@ -1653,7 +1653,8 @@ buildkernel: .MAKE .PHONY
cd ${KRNLCONFDIR}; \ cd ${KRNLCONFDIR}; \
PATH=${TMPPATH} \ PATH=${TMPPATH} \
config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} \ config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} \
-I '${KERNCONFDIR}' '${KERNCONFDIR}/${_kernel}' -I '${KERNCONFDIR}' -I '${KRNLCONFDIR}' \
'${KERNCONFDIR}/${_kernel}'
.endif .endif
.if !defined(NO_CLEAN) && !defined(NO_KERNELCLEAN) .if !defined(NO_CLEAN) && !defined(NO_KERNELCLEAN)
@echo @echo