From owner-p4-projects@FreeBSD.ORG  Mon Nov 17 02:13:16 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9E1E6106571E; Mon, 17 Nov 2008 02:13:16 +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 A74211065670
	for <perforce@freebsd.org>; Mon, 17 Nov 2008 02:13:15 +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 7D8498FC13
	for <perforce@freebsd.org>; Mon, 17 Nov 2008 02:13:15 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAH2DF4q055903
	for <perforce@freebsd.org>; Mon, 17 Nov 2008 02:13:15 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAH2DF60055901
	for perforce@freebsd.org; Mon, 17 Nov 2008 02:13:15 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 17 Nov 2008 02:13:15 GMT
Message-Id: <200811170213.mAH2DF60055901@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 153066 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: Mon, 17 Nov 2008 02:13:16 -0000

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

Change 153066 by jb@jb_freebsd3 on 2008/11/17 02:13:08

	Add the missing ctfmerge for the kernel object.

Affected files ...

.. //depot/projects/dtrace6/src/sys/conf/kern.post.mk#2 edit

Differences ...

==== //depot/projects/dtrace6/src/sys/conf/kern.post.mk#2 (text+ko) ====

@@ -83,6 +83,9 @@
 	@rm -f ${.TARGET}
 	@echo linking ${.TARGET}
 	${SYSTEM_LD}
+.if defined(CTFMERGE)
+	${SYSTEM_CTFMERGE}
+.endif
 .if !defined(DEBUG)
 	${OBJCOPY} --strip-debug ${.TARGET}
 .endif