Author: bdrewery
Date: Thu Apr 12 20:48:17 2018
New Revision: 332455
URL: https://svnweb.freebsd.org/changeset/base/332455
Log:
Use known SRCTOP if possible to determine SYSDIR.
Suggested by: sjg
Sponsored by: Dell EMC
Modified:
head/share/mk/bsd.dtb.mk
head/share/mk/bsd.kmod.mk
head/sys/conf/kmod.mk
Modified: head/share/mk/bsd.dtb.mk
==============================================================================
--- head/share/mk/bsd.dtb.mk Thu Apr 12 20:43:39 2018 (r332454)
+++ head/share/mk/bsd.dtb.mk Thu Apr 12 20:48:17 2018 (r332455)
@@ -3,7 +3,8 @@
# Search for kernel source tree in standard places.
.if empty(KERNBUILDDIR)
.if !defined(SYSDIR)
-.for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. ${.CURDIR}/../../../.. \
+.for _dir in ${SRCTOP:D${SRCTOP}/sys} \
+ ${.CURDIR}/../.. ${.CURDIR}/../../.. ${.CURDIR}/../../../.. \
${.CURDIR}/../../../../.. /sys /usr/src/sys
.if !defined(SYSDIR) && exists(${_dir}/kern/) && exists(${_dir}/conf/kmod.mk)
SYSDIR= ${_dir}
Modified: head/share/mk/bsd.kmod.mk
==============================================================================
--- head/share/mk/bsd.kmod.mk Thu Apr 12 20:43:39 2018 (r332454)
+++ head/share/mk/bsd.kmod.mk Thu Apr 12 20:48:17 2018 (r332455)
@@ -3,7 +3,8 @@
# Search for kernel source tree in standard places.
.if empty(KERNBUILDDIR)
.if !defined(SYSDIR)
-.for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. ${.CURDIR}/../../../.. \
+.for _dir in ${SRCTOP:D${SRCTOP}/sys} \
+ ${.CURDIR}/../.. ${.CURDIR}/../../.. ${.CURDIR}/../../../.. \
${.CURDIR}/../../../../.. /sys /usr/src/sys
.if !defined(SYSDIR) && exists(${_dir}/kern/) && exists(${_dir}/conf/kmod.mk)
SYSDIR= ${_dir:tA}
Modified: head/sys/conf/kmod.mk
==============================================================================
--- head/sys/conf/kmod.mk Thu Apr 12 20:43:39 2018 (r332454)
+++ head/sys/conf/kmod.mk Thu Apr 12 20:48:17 2018 (r332455)
@@ -83,7 +83,8 @@ OBJCOPY?= objcopy
# Search for kernel source tree in standard places.
.if empty(KERNBUILDDIR)
.if !defined(SYSDIR)
-.for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. /sys /usr/src/sys
+.for _dir in ${SRCTOP:D${SRCTOP}/sys} \
+ ${.CURDIR}/../.. ${.CURDIR}/../../.. /sys /usr/src/sys
.if !defined(SYSDIR) && exists(${_dir}/kern/)
SYSDIR= ${_dir:tA}
.endif
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
