Date: Mon, 1 Apr 2013 17:34:57 +0100 From: Chris Rees <crees@FreeBSD.org> To: John Baldwin <jhb@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Ed Maste <emaste@freebsd.org> Subject: Re: svn commit: r248751 - head/share/mk Message-ID: <CADLo839h8wYFdPgottaf3YNgk=xkXe7cTA-BJKko==bmzGmr4A@mail.gmail.com> In-Reply-To: <201304011217.41274.jhb@freebsd.org> References: <201303262011.r2QKBAjm094760@svn.freebsd.org> <201304011217.41274.jhb@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 1 April 2013 17:17, John Baldwin <jhb@freebsd.org> wrote: > On Tuesday, March 26, 2013 4:11:10 pm Ed Maste wrote: >> Author: emaste >> Date: Tue Mar 26 20:11:09 2013 >> New Revision: 248751 >> URL: http://svnweb.freebsd.org/changeset/base/248751 >> >> Log: >> Unconditionally include ${SRCCONF} if overridden >> >> This avoids silently failing to include ${SRCCONF} specified by a make(1) >> invocation. >> >> Modified: >> head/share/mk/bsd.own.mk >> >> Modified: head/share/mk/bsd.own.mk >> > ============================================================================== >> --- head/share/mk/bsd.own.mk Tue Mar 26 20:04:45 2013 (r248750) >> +++ head/share/mk/bsd.own.mk Tue Mar 26 20:11:09 2013 (r248751) >> @@ -117,7 +117,7 @@ __<bsd.own.mk>__: >> >> .if !defined(_WITHOUT_SRCCONF) >> SRCCONF?= /etc/src.conf >> -.if exists(${SRCCONF}) >> +.if exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf" >> .include "${SRCCONF}" >> .endif >> .endif > > Hmm, I'm confused why this matters? Was exists() failing for a file that did > exist? Can you give a more specific use case? I think it's useful that if you've set SRCCONF in make.conf, the build should complain about a lack of its existence. A single character spelling error in the name of SRCCONF will have the build silently failing to include it, thus resulting in enormous frustration when your settings aren't applied for some non-obvious reason... Chris
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CADLo839h8wYFdPgottaf3YNgk=xkXe7cTA-BJKko==bmzGmr4A>