aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2016-05-24 23:04:16 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2016-05-24 23:04:16 +0000
commit32a6d64c41a14c4003d3eb79196a8587988a692c (patch)
treeb6759234a16910b0740f7fae3e89b29a9b6dd8b1
parentf08798cea7c5bca59ff7e926df53bf64dec0207d (diff)
downloadsrc-32a6d64c41a14c4003d3eb79196a8587988a692c.tar.gz
src-32a6d64c41a14c4003d3eb79196a8587988a692c.zip
MFC 299310:
Don't store generated firmware object files in the source directory. Trim the leading directory of a firmware source file from the resulting target object file name so the object file is stored in the object directory. Previously, using 'FIRMWS= /path/to/fw.bin:fw.bin' would store the generated 'fw.bin.fwo' file in the /path/to directory. Now it stores it in the object directory of the kernel module being built.
Notes
Notes: svn path=/stable/8/; revision=300629
-rw-r--r--sys/conf/kmod.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 8fff58223ac2..cac703e3fe0f 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -149,7 +149,7 @@ SRCS+= ${KMOD:S/$/.c/}
CLEANFILES+= ${KMOD:S/$/.c/}
.for _firmw in ${FIRMWS}
-${_firmw:C/\:.*$/.fwo/}: ${_firmw:C/\:.*$//}
+${_firmw:C/\:.*$/.fwo/:T}: ${_firmw:C/\:.*$//}
@${ECHO} ${_firmw:C/\:.*$//} ${.ALLSRC:M*${_firmw:C/\:.*$//}}
@if [ -e ${_firmw:C/\:.*$//} ]; then \
${LD} -b binary --no-warn-mismatch ${LDFLAGS} \
@@ -161,7 +161,7 @@ ${_firmw:C/\:.*$/.fwo/}: ${_firmw:C/\:.*$//}
rm ${_firmw:C/\:.*$//}; \
fi
-OBJS+= ${_firmw:C/\:.*$/.fwo/}
+OBJS+= ${_firmw:C/\:.*$/.fwo/:T}
.endfor
.endif