svn commit: r234444 - in stable/9/usr.bin: kdump truss

[Dimitry Andric]

Author: dim
Date: Wed Apr 18 20:32:07 2012
New Revision: 234444
URL: http://svn.freebsd.org/changeset/base/234444

Log:
  MFC r234058:
    In kdump's mkioctls script, use '${CPP}' instead of hardcodedly using
    'gcc -E'.  This fixes building when WITH_CLANG_IS_CC is in effect.
  
    Report by:	Niclas Zeising <zeising at daemonic.se>
  
  MFC r234060:
    Since truss also uses kdump's mkioctls script, pass the value of ${CPP}
    there too, similar to r234058.

Modified:
  stable/9/usr.bin/kdump/Makefile
  stable/9/usr.bin/kdump/mkioctls
  stable/9/usr.bin/truss/Makefile
Directory Properties:
  stable/9/usr.bin/kdump/   (props changed)
  stable/9/usr.bin/truss/   (props changed)

Modified: stable/9/usr.bin/kdump/Makefile
==============================================================================
--- stable/9/usr.bin/kdump/Makefile	Wed Apr 18 19:34:20 2012	(r234443)
+++ stable/9/usr.bin/kdump/Makefile	Wed Apr 18 20:32:07 2012	(r234444)
@@ -20,7 +20,8 @@ WARNS?=		0
 CLEANFILES=	ioctl.c kdump_subr.c linux_syscalls.c
 
 ioctl.c: mkioctls
-	sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
+	env CPP="${CPP}" \
+	   sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
 
 kdump_subr.c: mksubr
 	sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include > ${.TARGET}

Modified: stable/9/usr.bin/kdump/mkioctls
==============================================================================
--- stable/9/usr.bin/kdump/mkioctls	Wed Apr 18 19:34:20 2012	(r234443)
+++ stable/9/usr.bin/kdump/mkioctls	Wed Apr 18 20:32:07 2012	(r234444)
@@ -29,7 +29,7 @@ ioctl_includes=`
 `
 
 awk -v x="$ioctl_includes" 'BEGIN {print x}' |
-	gcc -E -I$1 -dM -DCOMPAT_43TTY - |
+	$CPP -I$1 -dM -DCOMPAT_43TTY - |
 	awk -v ioctl_includes="$ioctl_includes" -v use_switch="$use_switch" '
 BEGIN {
 	print "/* XXX obnoxious prerequisites. */"

Modified: stable/9/usr.bin/truss/Makefile
==============================================================================
--- stable/9/usr.bin/truss/Makefile	Wed Apr 18 19:34:20 2012	(r234443)
+++ stable/9/usr.bin/truss/Makefile	Wed Apr 18 20:32:07 2012	(r234444)
@@ -23,7 +23,8 @@ syscalls.h:	syscalls.master
 		${.CURDIR}/i386.conf
 
 ioctl.c: ${.CURDIR}/../kdump/mkioctls
-	sh ${.CURDIR}/../kdump/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
+	env CPP="${CPP}" \
+	    sh ${.CURDIR}/../kdump/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
 
 .if ${MACHINE_CPUARCH} == "i386"
 SRCS+=	i386-linux.c linux_syscalls.h