Date: Thu, 1 Jan 2015 13:13:57 -0800 From: Garrett Cooper <yaneurabeya@gmail.com> To: Dimitry Andric <dim@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers <src-committers@freebsd.org>, Garrett Cooper <ngie@FreeBSD.org>, Ian Lepore <ian@FreeBSD.org> Subject: Re: svn commit: r276052 - head Message-ID: <00AE655C-0609-4FB0-A275-4A0B0AC9DF97@gmail.com> In-Reply-To: <23AC4621-7748-4724-BBDC-139E9F74CD99@gmail.com> References: <201412220452.sBM4qPAx096443@svn.freebsd.org> <68874DE1-3EAE-4A4D-9760-7661DA7AE846@FreeBSD.org> <1420130463.85983.0.camel@freebsd.org> <9A1C084E-B491-4581-A21C-AAB82687C588@FreeBSD.org> <1420133565.85983.5.camel@freebsd.org> <AC80C56B-46E9-4831-9B5F-976E28498F1D@FreeBSD.org> <CE0B8F8D-264D-4EC8-A5DB-FEA49652E19B@gmail.com> <CF7A718E-4B6D-4F1F-A0CA-E3127F8EDCC2@gmail.com> <B2C2C6B3-F0A0-4E02-85BC-9A2C92DAFE49@FreeBSD.org> <23AC4621-7748-4724-BBDC-139E9F74CD99@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On Jan 1, 2015, at 10:58, Garrett Cooper <yaneurabeya@gmail.com> wrote:
> On Jan 1, 2015, at 10:51, Dimitry Andric <dim@FreeBSD.org> wrote:
>
>> On 01 Jan 2015, at 19:42, Garrett Cooper <yaneurabeya@gmail.com> wrote:
>>>
>>> On Jan 1, 2015, at 10:38, Garrett Cooper <yaneurabeya@gmail.com> wrote:
>>>> On Jan 1, 2015, at 9:50, Dimitry Andric <dim@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. :)
>
> Removing MAKEOBJDIRPREFIX got me through build-tools with TARGET/TARGET_ARCH=powerpc and a native build as well.
>
> MAKEOBJDIRPREFIX gets set above it:
>
> 190 .if ${MACHINE} == ${TARGET} && ${MACHINE_ARCH} == ${TARGET_ARCH} && !defined(CROSS_BUILD_TESTING)
> 191 OBJTREE= ${MAKEOBJDIRPREFIX}
> 192 .else
> 193 OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH}
> 194 .endif
> ...
> 270 TMAKE= ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
>
> That being said, my commit was probably broken in a cross-build environment anyhow, as it was installing to ${WORLDTMP}/usr/bin, not ${WORLDTMP}/legacy/usr/bin (the latter is where all of the build tools go).
Oh cool. More make tinderbox broken-ness… https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=196425 .
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
Comment: GPGTools - https://gpgtools.org
iQEcBAEBCgAGBQJUpbiXAAoJEMZr5QU6S73e8BAH/2BkEpAjOSVGedCWJBfELvIQ
LuEGUIsjyIeWufd18KMWXPASz/LcHuzvVuo5i8S7ssyMNcaKQmIPFJJnqTXPOOdt
tcsRMPlONT4/y+XuXLudbfpKX/gECGFJkJdB1jp2Cjto9RS6p/zpV0G5QCxj0ljt
skCjBdUnVPSNyLmDIiM6AbR2keA29uwFDJFpgDgRTArdJWqcQhTU7dQ9qEa3U9Qk
uMnsZXEg0IsnfhP9pQa1p/OBgcNuIZ/OnP4q1V1gvLHF893d60+xSFuzXf6PHgBe
BfEVQahjFKfHS9Iflass/ydPN7EH1635VD0kFEv4sDadrXsTkvKMsADhCmLAyhU=
=0YgZ
-----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?00AE655C-0609-4FB0-A275-4A0B0AC9DF97>