mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-20 00:33:57 +00:00
Fix using wrong SYSDIR after r331683.
This was inadvertently overriding the first found SYSDIR with the last of /usr/src which could result in the wrong headers being used if not building from /usr/src. SYSDIR?= is not used here to avoid evaluating the exists() when unneeded. Reported by: rgrimes, sjg, Mark Millard Pointyhat to: bdrewery Sponsored by: Dell EMC
This commit is contained in:
parent
e979979acf
commit
711c77093c
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=332453
|
@ -5,7 +5,7 @@
|
||||||
.if !defined(SYSDIR)
|
.if !defined(SYSDIR)
|
||||||
.for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. ${.CURDIR}/../../../.. \
|
.for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. ${.CURDIR}/../../../.. \
|
||||||
${.CURDIR}/../../../../.. /sys /usr/src/sys
|
${.CURDIR}/../../../../.. /sys /usr/src/sys
|
||||||
.if exists(${_dir}/kern/) && exists(${_dir}/conf/kmod.mk)
|
.if !defined(SYSDIR) && exists(${_dir}/kern/) && exists(${_dir}/conf/kmod.mk)
|
||||||
SYSDIR= ${_dir}
|
SYSDIR= ${_dir}
|
||||||
.endif
|
.endif
|
||||||
.endfor
|
.endfor
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
.if !defined(SYSDIR)
|
.if !defined(SYSDIR)
|
||||||
.for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. ${.CURDIR}/../../../.. \
|
.for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. ${.CURDIR}/../../../.. \
|
||||||
${.CURDIR}/../../../../.. /sys /usr/src/sys
|
${.CURDIR}/../../../../.. /sys /usr/src/sys
|
||||||
.if exists(${_dir}/kern/) && exists(${_dir}/conf/kmod.mk)
|
.if !defined(SYSDIR) && exists(${_dir}/kern/) && exists(${_dir}/conf/kmod.mk)
|
||||||
SYSDIR= ${_dir:tA}
|
SYSDIR= ${_dir:tA}
|
||||||
.endif
|
.endif
|
||||||
.endfor
|
.endfor
|
||||||
|
|
|
@ -84,7 +84,7 @@ OBJCOPY?= objcopy
|
||||||
.if empty(KERNBUILDDIR)
|
.if empty(KERNBUILDDIR)
|
||||||
.if !defined(SYSDIR)
|
.if !defined(SYSDIR)
|
||||||
.for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. /sys /usr/src/sys
|
.for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. /sys /usr/src/sys
|
||||||
.if exists(${_dir}/kern/)
|
.if !defined(SYSDIR) && exists(${_dir}/kern/)
|
||||||
SYSDIR= ${_dir:tA}
|
SYSDIR= ${_dir:tA}
|
||||||
.endif
|
.endif
|
||||||
.endfor
|
.endfor
|
||||||
|
|
Loading…
Reference in a new issue