Date: Thu, 22 Apr 2010 09:30:02 +0000 (UTC) From: Alexander Leidinger <netchild@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r207058 - head Message-ID: <201004220930.o3M9U2GS034500@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: netchild Date: Thu Apr 22 09:30:02 2010 New Revision: 207058 URL: http://svn.freebsd.org/changeset/base/207058 Log: Remove explicit setting of NO_CTF in WMAKEENV and in the make call for the buildkernel. This way makeoptions WITH_CTF=yes not only works when compiling the tradtitional way, but also when using buildkernel. This does not enable the CTF part of the world, it still defaults to without CTF info. The cross/build-tools/bootstrap targets are not affected by this, they still have and should keep the explicit NO_CTF. Notified by: np Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Thu Apr 22 09:24:01 2010 (r207057) +++ head/Makefile.inc1 Thu Apr 22 09:30:02 2010 (r207058) @@ -259,7 +259,7 @@ WMAKEENV= ${CROSSENV} \ VERSION="${VERSION}" \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} -.if ${MK_CDDL} == "no" || defined(NO_CTF) +.if ${MK_CDDL} == "no" WMAKEENV+= NO_CTF=1 .endif WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP} @@ -780,7 +780,7 @@ buildkernel: @echo "--------------------------------------------------------------" cd ${KRNLOBJDIR}/${_kernel}; \ MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \ - ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF \ + ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS \ -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile # XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case. .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004220930.o3M9U2GS034500>