svn commit: r248751 - head/share/mk

[Ed Maste]

On 1 April 2013 12:34, Chris Rees <crees at freebsd.org> wrote:
> On 1 April 2013 17:17, John Baldwin <jhb at 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...

Exactly. In my case I had incorrectly specified the path to my
src.conf and it took longer than I'd like to admit to discover the
failure.

-Ed