svn commit: r234058 - head/usr.bin/kdump

Dimitry Andric dim at FreeBSD.org
Mon Apr 9 14:47:18 UTC 2012


Author: dim
Date: Mon Apr  9 14:47:18 2012
New Revision: 234058
URL: http://svn.freebsd.org/changeset/base/234058

Log:
  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 after:	1 week

Modified:
  head/usr.bin/kdump/Makefile
  head/usr.bin/kdump/mkioctls

Modified: head/usr.bin/kdump/Makefile
==============================================================================
--- head/usr.bin/kdump/Makefile	Mon Apr  9 14:17:22 2012	(r234057)
+++ head/usr.bin/kdump/Makefile	Mon Apr  9 14:47:18 2012	(r234058)
@@ -21,7 +21,7 @@ NO_WERROR?=	YES
 CLEANFILES=	ioctl.c kdump_subr.c kdump_subr.h linux_syscalls.c
 
 ioctl.c: mkioctls
-	env MACHINE=${MACHINE} \
+	env MACHINE=${MACHINE} CPP="${CPP}" \
 	    sh ${.CURDIR}/mkioctls print ${DESTDIR}/usr/include > ${.TARGET}
 
 kdump_subr.h: mksubr

Modified: head/usr.bin/kdump/mkioctls
==============================================================================
--- head/usr.bin/kdump/mkioctls	Mon Apr  9 14:17:22 2012	(r234057)
+++ head/usr.bin/kdump/mkioctls	Mon Apr  9 14:47:18 2012	(r234058)
@@ -38,7 +38,7 @@ case "${MACHINE}" in
 esac
 
 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 style="$style" '
 BEGIN {
 	print "/* XXX obnoxious prerequisites. */"


More information about the svn-src-all mailing list