Author: bdrewery
Date: Tue May 31 23:08:43 2016
New Revision: 301084
URL: https://svnweb.freebsd.org/changeset/base/301084
Log:
WITH_META_MODE: Resolve SYSDIR to avoid changed build commands.
Sponsored by: EMC / Isilon Storage Division
Modified:
head/share/mk/bsd.kmod.mk
head/sys/conf/kern.post.mk
head/sys/conf/kmod.mk
Modified: head/share/mk/bsd.kmod.mk
==============================================================================
--- head/share/mk/bsd.kmod.mk Tue May 31 22:37:11 2016 (r301083)
+++ head/share/mk/bsd.kmod.mk Tue May 31 23:08:43 2016 (r301084)
@@ -4,7 +4,7 @@
.for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. ${.CURDIR}/../../../.. \
${.CURDIR}/../../../../.. /sys /usr/src/sys
.if !defined(SYSDIR) && exists(${_dir}/kern/) && exists(${_dir}/conf/kmod.mk)
-SYSDIR= ${_dir}
+SYSDIR= ${_dir:tA}
.endif
.endfor
.if !defined(SYSDIR) || !exists(${SYSDIR}/kern/) || \
Modified: head/sys/conf/kern.post.mk
==============================================================================
--- head/sys/conf/kern.post.mk Tue May 31 22:37:11 2016 (r301083)
+++ head/sys/conf/kern.post.mk Tue May 31 23:08:43 2016 (r301084)
@@ -12,7 +12,7 @@
.if defined(DESTDIR)
MKMODULESENV+= DESTDIR="${DESTDIR}"
.endif
-SYSDIR?= ${S:C;^[^/];${.CURDIR}/&;}
+SYSDIR?= ${S:C;^[^/];${.CURDIR}/&;:tA}
MKMODULESENV+= KERNBUILDDIR="${.CURDIR}" SYSDIR="${SYSDIR}"
.if defined(CONF_CFLAGS)
Modified: head/sys/conf/kmod.mk
==============================================================================
--- head/sys/conf/kmod.mk Tue May 31 22:37:11 2016 (r301083)
+++ head/sys/conf/kmod.mk Tue May 31 23:08:43 2016 (r301084)
@@ -269,7 +269,7 @@ ${OBJS}: ${_link}
# Search for kernel source tree in standard places.
.for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. /sys /usr/src/sys
.if !defined(SYSDIR) && exists(${_dir}/kern/)
-SYSDIR= ${_dir}
+SYSDIR= ${_dir:tA}
.endif
.endfor
.if !defined(SYSDIR) || !exists(${SYSDIR}/kern/)
_______________________________________________
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"
