PERFORCE change 141962 for review

[John Birrell]

http://perforce.freebsd.org/chv.cgi?CH=141962

Change 141962 by jb at freebsd3 on 2008/05/21 05:19:14

	DEBUG_FLAGS is a FreeBSD makefile-specific thing, not a general
	sys.mk thing, so look in CFLAGS to see if debug is turned on. This
	won't catch -g being added to CFLAGS later though.
	
	Default CTF to off for now since we don't need it un userland until
	we can DTrace userland.
	
	Defaulting to off means that buildworld times won't be impacted by
	the need to build with debug info for the CTF conversion.

Affected files ...

.. //depot/projects/dtrace/src/share/mk/sys.mk#22 edit

Differences ...

==== //depot/projects/dtrace/src/share/mk/sys.mk#22 (text+ko) ====

@@ -45,16 +45,22 @@
 .endif
 .endif
 
+# Turn CTF conversion off by default for now. This default could be
+# changed later if DTrace becomes popular.
+.if !defined(WITH_CTF)
+NO_CTF		=	1
+.endif
+
 # C Type Format data is required for DTrace
 CTFFLAGS	?=	-L VERSION
 
 .if !defined(NO_CTF)
 CTFCONVERT	?=	ctfconvert
 CTFMERGE	?=	ctfmerge
-.if defined(DEBUG_FLAGS)
+.if defined(CFLAGS) && (${CFLAGS:M-g} != "")
 CTFFLAGS	+=	-g
 .else
-DEBUG_FLAGS	=	-g
+CFLAGS		+=	-g
 .endif
 .endif