From owner-svn-src-head@FreeBSD.ORG Thu Jan 1 18:58:28 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B5D5DF1A; Thu, 1 Jan 2015 18:58:28 +0000 (UTC) Received: from mail-pd0-x234.google.com (mail-pd0-x234.google.com [IPv6:2607:f8b0:400e:c02::234]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 77A73B17; Thu, 1 Jan 2015 18:58:28 +0000 (UTC) Received: by mail-pd0-f180.google.com with SMTP id fl12so7006204pdb.39; Thu, 01 Jan 2015 10:58:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :message-id:references:to; bh=5P+527PijwcQQm9HB0rlLE2q5quLeyWceKY/hkrBG8Q=; b=yoNsoapEUGkU7EAHV4GuM07PDffTD4O4mbpNBbhmWFSQ7a+o21Prl+eQ/H6iVjFuKH M3azow59B182O6xn/btpUHhf970JHwX1LXN4tD4igdM3AVZZN2UAoXm5NFifazDeo+lD TPttOeZ17rHMnTE9cv5oiD2vc2VNVEoQKZQA/iQnbt8lSAZVLr1ToF2etOFk0qhOxHrt p83vKuKzIVZb8vFuZhnuS3AoPsdluHXQOxEdCdkpYGyC753dEiYl9ky4EK9xum0eH6yM hNy1qkwR2qYr2mSnJPOBjbDTtc269IrvNSDzBBNsz2uHxrAldCkUJRqu6w5VIjo4WJe1 Hc1A== X-Received: by 10.70.50.41 with SMTP id z9mr116499126pdn.31.1420138707970; Thu, 01 Jan 2015 10:58:27 -0800 (PST) Received: from ?IPv6:2601:8:ab80:7d6:6d22:f632:3b17:f5d8? ([2601:8:ab80:7d6:6d22:f632:3b17:f5d8]) by mx.google.com with ESMTPSA id bq7sm44512855pdb.50.2015.01.01.10.58.26 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 01 Jan 2015 10:58:27 -0800 (PST) Content-Type: multipart/signed; boundary="Apple-Mail=_E15451F6-07FF-41A7-B2B1-8791DB6077D4"; protocol="application/pgp-signature"; micalg=pgp-sha512 Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: svn commit: r276052 - head From: Garrett Cooper In-Reply-To: Date: Thu, 1 Jan 2015 10:58:25 -0800 Message-Id: <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> To: Dimitry Andric X-Mailer: Apple Mail (2.1878.6) 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:58:28 -0000 --Apple-Mail=_E15451F6-07FF-41A7-B2B1-8791DB6077D4 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 On Jan 1, 2015, at 10:51, Dimitry Andric wrote: > 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} \ >=20 > 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. :-) >=20 > What I've tried instead, is this: >=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 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 \ >=20 > 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=3Dpowerpc and a native build as well. MAKEOBJDIRPREFIX gets set above it: 190 .if ${MACHINE} =3D=3D ${TARGET} && ${MACHINE_ARCH} =3D=3D = ${TARGET_ARCH} && !defined(CROSS_BUILD_TESTING) 191 OBJTREE=3D ${MAKEOBJDIRPREFIX} 192 .else 193 OBJTREE=3D ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH} 194 .endif ... 270 TMAKE=3D ${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). Thanks! --Apple-Mail=_E15451F6-07FF-41A7-B2B1-8791DB6077D4 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----- Comment: GPGTools - https://gpgtools.org iQEcBAEBCgAGBQJUpZjRAAoJEMZr5QU6S73egrsIAKZgxqxXek9TTObxzHTIvXsi +te5JglIn4If0vEnraJABJDusLSNx97HjfIuW8rery+8rkr757b98K5fzP48cNwR MV6nlk696BucClWI6Qqa2x/Pj995s/AcXFnfAIH1m9U2Y5w4tQoR20F2q5rRbIup TCaDa50l42B9pSKsn4yo1A2ovfrbugXP2knCZs6aIwS1ec4CzwkBBMUf9lUwsg+O PHjCU/2YLITRqlBWeAN2pre+9H648W4OEW1U+pn6eI5Tegu1EBFVruWWBQYxn7pb lH6Jk2XQRhJP1m0sn5TGOXJcphqgavR3oTC8FxkTdpgNftmBbace/A9o4a8a/NM= =VGrH -----END PGP SIGNATURE----- --Apple-Mail=_E15451F6-07FF-41A7-B2B1-8791DB6077D4--