On 01 Jan 2015, at 19:42, Garrett Cooper <yaneurab...@gmail.com> wrote:
>
> On Jan 1, 2015, at 10:38, Garrett Cooper <yaneurab...@gmail.com> wrote:
>> On Jan 1, 2015, at 9:50, Dimitry Andric <d...@freebsd.org> wrote:
...
>>> No, just MK_INFO=yes, as I said. That is what Garrett tried to fix in
>>> this commit, but which only works for native builds.
>>>
>>> I'll be coming up with a fix shortly.
>>
>> OBJTREE is being populated with TARGET.TARGET_ARCH twice… That’s the bug.
>>
>> Unfortunately this commit only made this issue apparent. Sorry for not
>> testing with a non-native build :(...
>
> I suspect this will fix it. Going to do a tinderbox run then I’ll put it out
> for review:
>
> Index: Makefile.inc1
> ===================================================================
> --- Makefile.inc1 (revision 276492)
> +++ Makefile.inc1 (working copy)
> @@ -267,8 +267,7 @@
> MK_LLDB=no MK_TESTS=no
>
> # build-tools stage
> -TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \
> - ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
> +TMAKE= ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
> TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
> DESTDIR= \
> BOOTSTRAPPING=${OSRELDATE} \
Hm, wasn't MAKEOBJDIRPREFIX set to that value on purpose, originally?
And if so, won't removing it break some assumption elsewhere? That
said, this was added in r54684, 15 years ago, so maybe this is slightly
out of date. :-)
What I've tried instead, is this:
Index: Makefile.inc1
===================================================================
--- Makefile.inc1 (revision 276480)
+++ Makefile.inc1 (working copy)
@@ -270,6 +271,7 @@
TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \
${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+ WORLDTMP=${WORLDTMP} \
DESTDIR= \
BOOTSTRAPPING=${OSRELDATE} \
SSP_CFLAGS= \
I'm currently testing this with a buildworld, and while it isn't
finished yet, it has died either, until now. :)
-Dimitry
signature.asc
Description: Message signed with OpenPGP using GPGMail
