diff options
| author | asomers <asomers@FreeBSD.org> | 2014-03-20 17:30:09 +0000 |
|---|---|---|
| committer | asomers <asomers@FreeBSD.org> | 2014-03-20 17:30:09 +0000 |
| commit | 1b1437fc8fbe4fe40af7cae92335a35aec85d9bc (patch) | |
| tree | 83f15c7ab1120080020260d8f604bcf3b9f155a7 /Makefile.inc1 | |
| parent | f0be5aaf9653563d6904cb6fd04a30ebd924329f (diff) | |
| download | FreeBSD-src-1b1437fc8fbe4fe40af7cae92335a35aec85d9bc.zip FreeBSD-src-1b1437fc8fbe4fe40af7cae92335a35aec85d9bc.tar.gz | |
Fix kern/187712: config(8) does not respect KERNCONFDIR.
The impact of this bug is that you cannot build a kernel if both of the
following are true:
1) The kernel config file is in a non-default location
2) The kernel config file uses the "include" statement from config(5).
usr.sbin/config/main.c
usr.sbin/config/config.8
usr.sbin/config/config.h
usr.sbin/config/lang.l
Added a "-I path" option to config(8). By analogy to cc(1), it adds
an extra path in which the "include" statement will search for
files.
Makefile.inc1
Pass "-I ${KERNCONFDIR}" to config(8).
PR: kern/187712
Reviewed by: will, imp (previous version)
MFC after: 3 weeks
Sponsored by: Spectra Logic Corporation
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 386b1ad..bb5ca22 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1015,7 +1015,7 @@ buildkernel: cd ${KRNLCONFDIR}; \ PATH=${TMPPATH} \ config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} \ - ${KERNCONFDIR}/${_kernel} + -I ${KERNCONFDIR} ${KERNCONFDIR}/${_kernel} .endif .if !defined(NO_CLEAN) && !defined(NO_KERNELCLEAN) @echo |
