summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2016-05-31 23:08:43 +0000
committerbdrewery <bdrewery@FreeBSD.org>2016-05-31 23:08:43 +0000
commit31fcbcd3005b629a754aeeab5538b215de12e4c6 (patch)
tree552dbcdf71b9bca3d013262345f244c477af9a8e /sys/conf
parent6c2e87562904ce1adecc0d9a28af84e08dc1cf4d (diff)
downloadFreeBSD-src-31fcbcd3005b629a754aeeab5538b215de12e4c6.zip
FreeBSD-src-31fcbcd3005b629a754aeeab5538b215de12e4c6.tar.gz
WITH_META_MODE: Resolve SYSDIR to avoid changed build commands.
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/kern.post.mk2
-rw-r--r--sys/conf/kmod.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
index 19e8e2e..b81b9d9 100644
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
@@ -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)
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 570a34f..8bf017e 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -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/)
OpenPOWER on IntegriCloud