diff options
| -rw-r--r-- | Makefile.inc1 | 14 | ||||
| -rw-r--r-- | tools/regression/filemon/Makefile | 7 |
2 files changed, 10 insertions, 11 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index c15a2ba..f1a1e86 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -15,7 +15,7 @@ # -DNO_PORTSUPDATE do not update ports in ${MAKE} update # -DNO_ROOT install without using root privilege # -DNO_DOCUPDATE do not update doc in ${MAKE} update -# -DNO_CTF do not run the DTrace CTF conversion tools on built objects +# -DWITHOUT_CTF do not run the DTrace CTF conversion tools on built objects # LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list # LOCAL_LIB_DIRS="list of dirs" to add additional dirs to libraries target # LOCAL_MTREE="list of mtree files" to process to allow local directories @@ -248,7 +248,7 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ SSP_CFLAGS= \ MK_HTML=no MK_INFO=no NO_LINT=yes MK_MAN=no \ -DNO_PIC -DNO_PROFILE -DNO_SHARED \ - -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD MK_TESTS=no + -DNO_CPU_CFLAGS -DNO_WARNS MK_CTF=no -DEARLY_BUILD MK_TESTS=no # build-tools stage TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ @@ -258,7 +258,7 @@ TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ BOOTSTRAPPING=${OSRELDATE} \ SSP_CFLAGS= \ -DNO_LINT \ - -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD MK_TESTS=no + -DNO_CPU_CFLAGS -DNO_WARNS MK_CTF=no -DEARLY_BUILD MK_TESTS=no # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ @@ -277,7 +277,7 @@ KTMAKE= TOOLS_PREFIX=${WORLDTMP} MAKEOBJDIRPREFIX=${WORLDTMP} \ SSP_CFLAGS= \ MK_HTML=no MK_INFO=no -DNO_LINT MK_MAN=no \ -DNO_PIC -DNO_PROFILE -DNO_SHARED \ - -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD + -DNO_CPU_CFLAGS -DNO_WARNS MK_CTF=no -DEARLY_BUILD # world stage WMAKEENV= ${CROSSENV} \ @@ -294,7 +294,7 @@ HMAKE+= PATH=${TMPPATH} METALOG=${METALOG} -DNO_ROOT .endif .if ${MK_CDDL} == "no" -WMAKEENV+= NO_CTF=1 +WMAKEENV+= MK_CTF=no .endif .if defined(CROSS_TOOLCHAIN_PREFIX) @@ -400,7 +400,7 @@ LIB32WMAKEFLAGS+= CC="${XCC} ${LIB32FLAGS}" \ -DCOMPAT_32BIT \ -DLIBRARIES_ONLY \ -DNO_CPU_CFLAGS \ - -DNO_CTF \ + MK_CTF=no \ -DNO_LINT \ MK_TESTS=no @@ -609,7 +609,7 @@ build32: WORLDTMP=${WORLDTMP} \ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \ MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \ - DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF \ + DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS MK_CTF=no \ -DEARLY_BUILD build-tools .endfor cd ${.CURDIR}; \ diff --git a/tools/regression/filemon/Makefile b/tools/regression/filemon/Makefile index 027f131..6ee88f4 100644 --- a/tools/regression/filemon/Makefile +++ b/tools/regression/filemon/Makefile @@ -22,9 +22,8 @@ MAN= WARNS?= 6 CFLAGS+= -I${.CURDIR}/../../../sys -# Should be "WITHOUT_CTF=" below, but stupid infastrurture fails: -# "/usr/share/mk/bsd.own.mk", line 489: WITH_CTF and WITHOUT_CTF can't both be set. -WITHOUT_CDDL= +# We don't want to genreate CTF files. Force that here. +MK_CTF=no CLEANFILES+= ${BINS} @@ -59,7 +58,7 @@ test01: ${BINS:Mfilemontest*} ${BINS:Msizeof_long*} clean-test grep -q -v '\.[0-9][0-9][0-9][0-9][0-9][0-9]$$' || printf "Time stamp format OK\n\n" .endfor @cd ${.CURDIR} ; set +e ; for F in filemon_log.* ; do \ - tail -1 $$F | grep -q '# Bye bye' || echo "$$F missing filemon bye-bye" ; \ + tail -1 $$F | grep -q '# Bye bye' || echo "$$F missing filemon bye-bye" ; \ NL=`wc -l $$F | awk '{print $$1}'` ; \ if [ "$${NL}" != 97 ]; then echo "$$F BAD, contains $${NL} lines" ; exit 1 ; fi ; done |
