aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2016-11-13 00:11:15 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2016-11-13 00:11:15 +0000
commit7c6d0bb1a04aa66006b38ea158a92d0543b57896 (patch)
tree035e3651d88036444c65cacae4cfe1ef72c15192
parent5e1eb60d943d42d38113a8c3f2df04899d488948 (diff)
downloadsrc-7c6d0bb1a04aa66006b38ea158a92d0543b57896.tar.gz
src-7c6d0bb1a04aa66006b38ea158a92d0543b57896.zip
Move libsysdecode-specific hack out of buildworld.
This should fix the lib32 build since it was not removing the generated ioctl.c. This file is generated by a find(1) call, so cannot use normal dependency tracking methods. Reported by: jhb MFC after: 2 weeks Sponsored by: Dell EMC Isilon
Notes
Notes: svn path=/head/; revision=308603
-rw-r--r--Makefile.inc13
-rw-r--r--lib/libsysdecode/Makefile7
2 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 5db4acbeaa36..d78cfd26a162 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -676,9 +676,6 @@ _worldtmp: .PHONY
.endif
.else
rm -rf ${WORLDTMP}/legacy/usr/include
-# XXX - These can depend on any header file.
- rm -f ${OBJTREE}${.CURDIR}/lib/libsysdecode/ioctl.c
- rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/kdump_subr.c
.endif
.for _dir in \
lib lib/casper usr legacy/bin legacy/usr
diff --git a/lib/libsysdecode/Makefile b/lib/libsysdecode/Makefile
index 692bfbf6f08d..b84ef4e615b8 100644
--- a/lib/libsysdecode/Makefile
+++ b/lib/libsysdecode/Makefile
@@ -114,7 +114,12 @@ DEPENDOBJS+= tables.h
tables.h: mktables
sh ${.CURDIR}/mktables ${DESTDIR}${INCLUDEDIR} ${.TARGET}
-ioctl.c: mkioctls
+# mkioctls runs find(1) for headers so needs to rebuild every time. This used
+# to be a hack only done in buildworld.
+.if !defined(_SKIP_BUILD)
+ioctl.c: .PHONY
+.endif
+ioctl.c: mkioctls .META
env MACHINE=${MACHINE} CPP="${CPP}" \
/bin/sh ${.CURDIR}/mkioctls ${DESTDIR}${INCLUDEDIR} > ${.TARGET}