svn commit: r282260 - head

[Garrett Cooper]

On Apr 29, 2015, at 17:17, Sean Bruno <sbruno at FreeBSD.org> wrote:

> Author: sbruno
> Date: Thu Apr 30 00:17:32 2015
> New Revision: 282260
> URL: https://svnweb.freebsd.org/changeset/base/282260
> 
> 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.
> 
>  Reviewed by:	imp
> 
> Modified:
>  head/Makefile.inc1
> 
> Modified: head/Makefile.inc1
> ==============================================================================
> --- 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=	${NXBENV} ${MAKE} \
> 		MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \
> 		MK_LLDB=no
> 
> +# 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} != "no"
> +	mkdir -p ${OBJTREE}/gperf_for_gcc/usr/bin
> +	${_+_}@${ECHODIR} "===> ${_gperf} (obj,depend,all,install)"; \
> +	cd ${.CURDIR}/${_gperf} && \
> +	${NXBMAKE} DIRPRFX=${_gperf}/ obj && \
> +	${NXBMAKE} DIRPRFX=${_gperf}/ depend && \
> +	${NXBMAKE} DIRPRFX=${_gperf}/ all && \
> +	${NXBMAKE} DIRPRFX=${_gperf}/ DESTDIR=${OBJTREE}/gperf_for_gcc install
> +	PATH=${PATH}:${OBJTREE}/gperf_for_gcc/usr/bin

This $PATH doesn’t get used though…

Oi though... Is there any way to make the xtools targets use the other targets :/...?
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 496 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.freebsd.org/pipermail/svn-src-head/attachments/20150429/085f989e/attachment.sig>