From owner-p4-projects@FreeBSD.ORG  Wed May 21 05:20:04 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6434E1065676; Wed, 21 May 2008 05:20:04 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 253241065671
	for <perforce@freebsd.org>; Wed, 21 May 2008 05:20:04 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 19A3A8FC18
	for <perforce@freebsd.org>; Wed, 21 May 2008 05:20:04 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4L5K4Vm027293
	for <perforce@freebsd.org>; Wed, 21 May 2008 05:20:04 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4L5K3oU027291
	for perforce@freebsd.org; Wed, 21 May 2008 05:20:03 GMT
	(envelope-from jb@freebsd.org)
Date: Wed, 21 May 2008 05:20:03 GMT
Message-Id: <200805210520.m4L5K3oU027291@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 141962 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 May 2008 05:20:04 -0000

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

Change 141962 by jb@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