From owner-svn-src-all@FreeBSD.ORG  Tue Oct 23 19:04:49 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id C94C3FFB;
 Tue, 23 Oct 2012 19:04:49 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id AB8438FC17;
 Tue, 23 Oct 2012 19:04:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9NJ4nnE036049;
 Tue, 23 Oct 2012 19:04:49 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9NJ4niV036046;
 Tue, 23 Oct 2012 19:04:49 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201210231904.q9NJ4niV036046@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 23 Oct 2012 19:04:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r241962 - stable/8/sys/conf
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Oct 2012 19:04:50 -0000

Author: jhb
Date: Tue Oct 23 19:04:49 2012
New Revision: 241962
URL: http://svn.freebsd.org/changeset/base/241962

Log:
  Remove attempt to use an empty NORMAL_CTFCONVERT and always fall back to
  using a the null "@:" command if CTF is disabled.

Modified:
  stable/8/sys/conf/kern.pre.mk

Modified: stable/8/sys/conf/kern.pre.mk
==============================================================================
--- stable/8/sys/conf/kern.pre.mk	Tue Oct 23 19:04:05 2012	(r241961)
+++ stable/8/sys/conf/kern.pre.mk	Tue Oct 23 19:04:49 2012	(r241962)
@@ -137,8 +137,6 @@ NORMAL_FWO= ${LD} -b binary --no-warn-mi
 
 .if ${MK_CTF} != "no"
 NORMAL_CTFCONVERT=	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.elif ${MAKE_VERSION} >= 5201111300
-NORMAL_CTFCONVERT=
 .else
 NORMAL_CTFCONVERT=	@:
 .endif