summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2017-01-03 23:10:57 +0000
committerbdrewery <bdrewery@FreeBSD.org>2017-01-03 23:10:57 +0000
commit4d1e85786c9543e55fd7233bd9d6e85458b5504f (patch)
tree4baef497a290cc027206f2f08c01b67aa3a8dad5
parentf8a5ad0fea21893360959ae794e2fe447defad9d (diff)
downloadFreeBSD-src-4d1e85786c9543e55fd7233bd9d6e85458b5504f.zip
FreeBSD-src-4d1e85786c9543e55fd7233bd9d6e85458b5504f.tar.gz
MFC r308603:
Move libsysdecode-specific hack out of buildworld.
-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 f221221..c212160 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -655,9 +655,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 123ea49..0ec1212 100644
--- a/lib/libsysdecode/Makefile
+++ b/lib/libsysdecode/Makefile
@@ -36,7 +36,12 @@ CFLAGS.gcc.ioctl.c+= -Wno-unused
CFLAGS.gcc+= ${CFLAGS.gcc.${.IMPSRC}}
-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}
OpenPOWER on IntegriCloud