diff options
| author | des <des@FreeBSD.org> | 2011-10-13 16:29:24 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2011-10-13 16:29:24 +0000 |
| commit | c9a3d28e97b357af334a68382823f39076347e40 (patch) | |
| tree | b39dc0f528e3af5a2c84f983c775906632a6e020 | |
| parent | d5c0a67c82352d26482cb3fc2ffe3a5e695d854c (diff) | |
| download | FreeBSD-src-c9a3d28e97b357af334a68382823f39076347e40.zip FreeBSD-src-c9a3d28e97b357af334a68382823f39076347e40.tar.gz | |
Clean up mkioctls a bit, and fix cross-building by checking ${MACHINE}
instead of $(uname -m).
Pointed out by: nyan@
| -rw-r--r-- | usr.bin/kdump/Makefile | 3 | ||||
| -rw-r--r-- | usr.bin/kdump/mkioctls | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile index ea2a604..0af84cc 100644 --- a/usr.bin/kdump/Makefile +++ b/usr.bin/kdump/Makefile @@ -21,7 +21,8 @@ NO_WERROR?= YES CLEANFILES= ioctl.c kdump_subr.c kdump_subr.h linux_syscalls.c ioctl.c: mkioctls - sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET} + env MACHINE=${MACHINE} \ + sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET} kdump_subr.h: mksubr sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include | \ diff --git a/usr.bin/kdump/mkioctls b/usr.bin/kdump/mkioctls index 33107df..7ef2865 100644 --- a/usr.bin/kdump/mkioctls +++ b/usr.bin/kdump/mkioctls @@ -13,15 +13,16 @@ LC_ALL=C; export LC_ALL # Build a list of headers that have ioctls in them. # XXX should we use an ANSI cpp? -ioctl_includes=` +ioctl_includes=$( cd $1 find -H -s * -name '*.h' | grep -v '.*disk.*\.h' | \ xargs egrep -l \ '^#[ ]*define[ ]+[A-Za-z_][A-Za-z0-9_]*[ ]+_IO[^a-z0-9_]' | - awk '{printf("#include <%s>\\\\n", $1)}' -` + awk '{printf("#include <%s>\\n", $1)}' +) -case "`uname -m`" in +: ${MACHINE=$(uname -m)} +case "${MACHINE}" in *pc98*) ioctl_includes="$ioctl_includes#include <sys/diskpc98.h>\\n" ;; |
