git: 36269b823182 - main - Fix native-xtools build

[Jessica Clarke]

On 3 Aug 2021, at 18:00, Bryan Drewery <bdrewery at FreeBSD.org> wrote:
> 
> On 8/3/2021 8:26 AM, Jessica Clarke wrote:
>> On 3 Aug 2021, at 16:22, Bryan Drewery <bdrewery at FreeBSD.org> wrote:
>>> 
>>> The branch main has been updated by bdrewery:
>>> 
>>> URL: https://cgit.FreeBSD.org/src/commit/?id=36269b82318280ef184c953b90674f5905e0f53f
>>> 
>>> commit 36269b82318280ef184c953b90674f5905e0f53f
>>> Author:     Bryan Drewery <bdrewery at FreeBSD.org>
>>> AuthorDate: 2021-08-03 15:20:57 +0000
>>> Commit:     Bryan Drewery <bdrewery at FreeBSD.org>
>>> CommitDate: 2021-08-03 15:22:14 +0000
>>> 
>>>   Fix native-xtools build
>>> 
>>>   Fixes           https://github.com/freebsd/poudriere/issues/894
>>>   Fixes:          d0c737e18 ("Makefile: Fix MAKEOBJDIRPREFIX command-line")
>>>   X-MFC-With:     d0c737e18
>>> ---
>>> Makefile      | 2 +-
>>> Makefile.inc1 | 4 +++-
>>> 2 files changed, 4 insertions(+), 2 deletions(-)
>>> 
>>> diff --git a/Makefile b/Makefile
>>> index c64873fb241b..711854f4693c 100644
>>> --- a/Makefile
>>> +++ b/Makefile
>>> @@ -218,7 +218,7 @@ _MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} MK_AUTO_OBJ=no \
>>>    ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} __MAKE_CONF=${__MAKE_CONF} \
>>>    SRCCONF=${SRCCONF} SRC_ENV_CONF= \
>>>    -f /dev/null -V MAKEOBJDIRPREFIX dummy
>>> -.if !empty(_MAKEOBJDIRPREFIX) || !empty(.MAKEOVERRIDES:MMAKEOBJDIRPREFIX)
>>> +.if !empty(_MAKEOBJDIRPREFIX)
>> 
>> Why was this reverted? This restores the bug I was fixing. Does your
>> change below not fix the actual issue you were seeing?
>> 
> 
> Sorry! This was not meant to be removed. It was just a mishap from testing.
> 
> I reverted it and pushed the proper fix just now.

Thanks, glad my understanding was correct. I’ll give my commit longer
to bake before MFC’ing with this one to see if any other regressions
pop up.

Jess