From owner-svn-src-all@FreeBSD.ORG Wed Nov 23 12:25:41 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 68135106567B; Wed, 23 Nov 2011 12:25:41 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id 1945F8FC1A; Wed, 23 Nov 2011 12:25:40 +0000 (UTC) Received: from ds4.des.no (des.no [84.49.246.2]) by smtp.des.no (Postfix) with ESMTP id 1EA5D64D3; Wed, 23 Nov 2011 12:25:40 +0000 (UTC) Received: by ds4.des.no (Postfix, from userid 1001) id EEDC185D4; Wed, 23 Nov 2011 13:25:39 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Peter Wemm References: <201111211635.pALGZvSS051067@svn.freebsd.org> <4A740CCF-AB73-41E3-B2C6-344B4A067B00@FreeBSD.org> <8662ibkfjs.fsf@ds4.des.no> <4ECC2D0D.6080608@FreeBSD.org> Date: Wed, 23 Nov 2011 13:25:39 +0100 In-Reply-To: (Peter Wemm's message of "Tue, 22 Nov 2011 15:37:46 -0800") Message-ID: <86lir7hvp8.fsf@ds4.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: Doug Barton , Rui Paulo , svn-src-all@freebsd.org, Ben Kaduk , src-committers@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r227797 - head/share/mk X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Nov 2011 12:25:41 -0000 Peter Wemm writes: > However.. the first thing I noticed was this commit *adds* a .c.o: > rule in bsd.lib.mk, which replaces the default in sys.mk. > > The one in sys.mk has ctfconvert rules and the new one does not. At > face value, this alone looks suspicious. Ah, that's a mismerge. The patch has been in my tree since before CTF support was added, and since my new rule is in a different file, there was no conflict to alert me to the problem. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no