Date: Wed, 29 Apr 2015 17:29:17 -0700 From: Garrett Cooper <yaneurabeya@gmail.com> To: Sean Bruno <sbruno@FreeBSD.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r282260 - head Message-ID: <A7886FC5-6F7B-4B13-AFE0-8BE6A6EB8A83@gmail.com> In-Reply-To: <201504300017.t3U0HXgf032607@svn.freebsd.org> References: <201504300017.t3U0HXgf032607@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail=_AA894F30-21B2-48F8-9439-4D6A467B26BB Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 On Apr 29, 2015, at 17:17, Sean Bruno <sbruno@FreeBSD.org> wrote: > Author: sbruno > Date: Thu Apr 30 00:17:32 2015 > New Revision: 282260 > URL: https://svnweb.freebsd.org/changeset/base/282260 >=20 > Log: > Fix native-xtools breakage when building a gcc enabled target on a = clang > enabled host. Build a one-off gperf and put it in the PATH for the = rest > of the target so the ONE call to gperf by the gcc build picks it up = and > DTRT. >=20 > Reviewed by: imp >=20 > Modified: > head/Makefile.inc1 >=20 > Modified: head/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=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/Makefile.inc1 Wed Apr 29 23:44:28 2015 = (r282259) > +++ head/Makefile.inc1 Thu Apr 30 00:17:32 2015 = (r282260) > @@ -1535,7 +1535,22 @@ NXBMAKE=3D ${NXBENV} ${MAKE} \ > MK_CLANG_EXTRAS=3Dno MK_CLANG_FULL=3Dno \ > MK_LLDB=3Dno >=20 > +# native-xtools is the current target for qemu-user cross builds of = ports > +# via poudriere and the imgact_binmisc kernel module. > +# For non-clang enabled targets that are still using the in tree gcc > +# we must build a gperf binary for one instance of its Makefiles. On > +# clang-enabled systems, the gperf binary is obsolete. > native-xtools: .MAKE > +.if ${MK_GCC_BOOTSTRAP} !=3D "no" > + mkdir -p ${OBJTREE}/gperf_for_gcc/usr/bin > + ${_+_}@${ECHODIR} "=3D=3D=3D> ${_gperf} = (obj,depend,all,install)"; \ > + cd ${.CURDIR}/${_gperf} && \ > + ${NXBMAKE} DIRPRFX=3D${_gperf}/ obj && \ > + ${NXBMAKE} DIRPRFX=3D${_gperf}/ depend && \ > + ${NXBMAKE} DIRPRFX=3D${_gperf}/ all && \ > + ${NXBMAKE} DIRPRFX=3D${_gperf}/ DESTDIR=3D${OBJTREE}/gperf_for_gcc= install > + PATH=3D${PATH}:${OBJTREE}/gperf_for_gcc/usr/bin This $PATH doesn=92t get used though=85 Oi though... Is there any way to make the xtools targets use the other = targets :/...? --Apple-Mail=_AA894F30-21B2-48F8-9439-4D6A467B26BB 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 iQEcBAEBCgAGBQJVQXdfAAoJEMZr5QU6S73eZ0YH/iZY8BRlYrPAOMTCOHc5dcH+ qls3LDO9xBbPOFoeHrN/3+vEHdsBMJkZEGmgpH6PJMGZKbdrDKN08DVUTj6nRq9b FPw2pdKojAktnjNObZ9nttLZjY6paI2itGXtM6+X+hx5UCm3rucYiwO39UYTFfVw 4dzbUkxmu/gzCvIZh5M43RWFA95F2ETc2WxacWGQrZYLerYf8bGyrfr/FLpxgls0 z5P4dFW9ff7Ji8RnmMZBzyXR897aDXobzIa3SvyMEIuzIzczXxYBqijdp54m+M0K AzHnEae1HSrhJRVfPoXD4OsG2O+tBDjNjnVBFj13RWmNoSThzJzk9hwY9mSDPoM= =VpSY -----END PGP SIGNATURE----- --Apple-Mail=_AA894F30-21B2-48F8-9439-4D6A467B26BB--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?A7886FC5-6F7B-4B13-AFE0-8BE6A6EB8A83>