diff options
| author | netchild <netchild@FreeBSD.org> | 2010-04-22 09:30:02 +0000 |
|---|---|---|
| committer | netchild <netchild@FreeBSD.org> | 2010-04-22 09:30:02 +0000 |
| commit | c0d6a78ddcc9bdcf4f9ee2858efab1abf0db5bdf (patch) | |
| tree | 6e2010a397759bfd22da44247e59a63e2df67035 /Makefile.inc1 | |
| parent | ed4ee98119878f97d4601661b5ad91df02318efe (diff) | |
| download | FreeBSD-src-c0d6a78ddcc9bdcf4f9ee2858efab1abf0db5bdf.zip FreeBSD-src-c0d6a78ddcc9bdcf4f9ee2858efab1abf0db5bdf.tar.gz | |
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
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 1c5d892..e54ae5c 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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) |
