Date: Thu, 1 Jan 2015 19:51:36 +0100 From: Dimitry Andric <dim@FreeBSD.org> To: Garrett Cooper <yaneurabeya@gmail.com> 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: <B2C2C6B3-F0A0-4E02-85BC-9A2C92DAFE49@FreeBSD.org> In-Reply-To: <CF7A718E-4B6D-4F1F-A0CA-E3127F8EDCC2@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>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail=_790ECAC5-8231-4EE0-8D98-CA0FE250384D
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
charset=windows-1252
On 01 Jan 2015, at 19:42, Garrett Cooper <yaneurabeya@gmail.com> wrote:
>=20
> 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=3Dyes, as I said. That is what Garrett tried to =
fix in
>>> this commit, but which only works for native builds.
>>>=20
>>> I'll be coming up with a fix shortly.
>>=20
>> OBJTREE is being populated with TARGET.TARGET_ARCH twice=85 That=92s =
the bug.
>>=20
>> Unfortunately this commit only made this issue apparent. Sorry for =
not testing with a non-native build :(...
>=20
> I suspect this will fix it. Going to do a tinderbox run then I=92ll =
put it out for review:
>=20
> Index: Makefile.inc1
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- Makefile.inc1 (revision 276492)
> +++ Makefile.inc1 (working copy)
> @@ -267,8 +267,7 @@
> MK_LLDB=3Dno MK_TESTS=3Dno
>=20
> # build-tools stage
> -TMAKE=3D MAKEOBJDIRPREFIX=3D${OBJTREE} \
> - ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
> +TMAKE=3D ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f =
Makefile.inc1 \
> TARGET=3D${TARGET} TARGET_ARCH=3D${TARGET_ARCH} \
> DESTDIR=3D \
> BOOTSTRAPPING=3D${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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- Makefile.inc1 (revision 276480)
+++ Makefile.inc1 (working copy)
@@ -270,6 +271,7 @@
TMAKE=3D MAKEOBJDIRPREFIX=3D${OBJTREE} \
${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
TARGET=3D${TARGET} TARGET_ARCH=3D${TARGET_ARCH} \
+ WORLDTMP=3D${WORLDTMP} \
DESTDIR=3D \
BOOTSTRAPPING=3D${OSRELDATE} \
SSP_CFLAGS=3D \
I'm currently testing this with a buildworld, and while it isn't
finished yet, it has died either, until now. :)
-Dimitry
--Apple-Mail=_790ECAC5-8231-4EE0-8D98-CA0FE250384D
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename=signature.asc
Content-Type: application/pgp-signature;
name=signature.asc
Content-Description: Message signed with OpenPGP using GPGMail
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.26
iEYEARECAAYFAlSllzwACgkQsF6jCi4glqN7lwCfegGoLOJQ81Jceez5USsOL53J
RxQAoNExZarkcqellFrgtATCSXD9Jcye
=qKft
-----END PGP SIGNATURE-----
--Apple-Mail=_790ECAC5-8231-4EE0-8D98-CA0FE250384D--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?B2C2C6B3-F0A0-4E02-85BC-9A2C92DAFE49>