Date: Wed, 23 Nov 2011 13:25:39 +0100 From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@des.no> To: Peter Wemm <peter@wemm.org> Cc: Doug Barton <dougb@freebsd.org>, Rui Paulo <rpaulo@freebsd.org>, svn-src-all@freebsd.org, Ben Kaduk <minimarmot@gmail.com>, src-committers@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r227797 - head/share/mk Message-ID: <86lir7hvp8.fsf@ds4.des.no> In-Reply-To: <CAGE5yCo26amQ%2B%2B8CTf_TX60PnSQeagf8oLzKV02pSRyRTWL_zw@mail.gmail.com> (Peter Wemm's message of "Tue, 22 Nov 2011 15:37:46 -0800") References: <201111211635.pALGZvSS051067@svn.freebsd.org> <4A740CCF-AB73-41E3-B2C6-344B4A067B00@FreeBSD.org> <8662ibkfjs.fsf@ds4.des.no> <D9B93827-6143-4ED2-9821-34F526F76D58@FreeBSD.org> <CAK2BMK6Fhn1D_gyNdHST8uSbkm00bt1DmouxHYCTFphAYeTz_Q@mail.gmail.com> <4ECC2D0D.6080608@FreeBSD.org> <CAGE5yCo26amQ%2B%2B8CTf_TX60PnSQeagf8oLzKV02pSRyRTWL_zw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Peter Wemm <peter@wemm.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86lir7hvp8.fsf>