From owner-svn-src-head@FreeBSD.ORG Thu Jan 1 18:51:45 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 09B47C77; Thu, 1 Jan 2015 18:51:45 +0000 (UTC) Received: from tensor.andric.com (unknown [IPv6:2001:7b8:3a7:1:2d0:b7ff:fea0:8c26]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client CN "tensor.andric.com", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A404DABC; Thu, 1 Jan 2015 18:51:44 +0000 (UTC) Received: from [IPv6:2001:7b8:3a7::28eb:6a07:fcba:ed4a] (unknown [IPv6:2001:7b8:3a7:0:28eb:6a07:fcba:ed4a]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 0732BB80A; Thu, 1 Jan 2015 19:51:40 +0100 (CET) Subject: Re: svn commit: r276052 - head Mime-Version: 1.0 (Mac OS X Mail 8.1 \(1993\)) Content-Type: multipart/signed; boundary="Apple-Mail=_790ECAC5-8231-4EE0-8D98-CA0FE250384D"; protocol="application/pgp-signature"; micalg=pgp-sha1 X-Pgp-Agent: GPGMail 2.5b4 From: Dimitry Andric In-Reply-To: Date: Thu, 1 Jan 2015 19:51:36 +0100 Message-Id: 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> To: Garrett Cooper X-Mailer: Apple Mail (2.1993) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers , Garrett Cooper , Ian Lepore X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jan 2015 18:51:45 -0000 --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 wrote: >=20 > On Jan 1, 2015, at 10:38, Garrett Cooper = wrote: >> On Jan 1, 2015, at 9:50, Dimitry Andric 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--