From owner-svn-src-all@FreeBSD.ORG Wed Apr 18 20:32:08 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D2D641065678; Wed, 18 Apr 2012 20:32:08 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A38A18FC0C; Wed, 18 Apr 2012 20:32:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3IKW8Ch049442; Wed, 18 Apr 2012 20:32:08 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3IKW8dS049438; Wed, 18 Apr 2012 20:32:08 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201204182032.q3IKW8dS049438@svn.freebsd.org> From: Dimitry Andric Date: Wed, 18 Apr 2012 20:32:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r234444 - in stable/9/usr.bin: kdump truss X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Apr 2012 20:32:08 -0000 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 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