svn commit: r311197 - in stable/11: . lib/libsysdecode
Bryan Drewery
bdrewery at FreeBSD.org
Tue Jan 3 23:10:58 UTC 2017
Author: bdrewery
Date: Tue Jan 3 23:10:57 2017
New Revision: 311197
URL: https://svnweb.freebsd.org/changeset/base/311197
Log:
MFC r308603:
Move libsysdecode-specific hack out of buildworld.
Modified:
stable/11/Makefile.inc1
stable/11/lib/libsysdecode/Makefile
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/Makefile.inc1
==============================================================================
--- stable/11/Makefile.inc1 Tue Jan 3 23:09:01 2017 (r311196)
+++ stable/11/Makefile.inc1 Tue Jan 3 23:10:57 2017 (r311197)
@@ -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
Modified: stable/11/lib/libsysdecode/Makefile
==============================================================================
--- stable/11/lib/libsysdecode/Makefile Tue Jan 3 23:09:01 2017 (r311196)
+++ stable/11/lib/libsysdecode/Makefile Tue Jan 3 23:10:57 2017 (r311197)
@@ -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}
More information about the svn-src-stable-11
mailing list