Date: Sat, 28 May 2016 21:30:45 -0700 From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r300926 - head Message-ID: <73c7c1db-d753-e065-1b51-acc5f3f8c137@FreeBSD.org> In-Reply-To: <201605290145.u4T1jFOX099601@repo.freebsd.org> References: <201605290145.u4T1jFOX099601@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 5/28/16 6:45 PM, Bryan Drewery wrote: > Author: bdrewery > Date: Sun May 29 01:45:15 2016 > New Revision: 300926 > URL: https://svnweb.freebsd.org/changeset/base/300926 > > Log: > Libcompat: Set build tools in environment rather than make overrides. > Sigh. I just realized this breaks the build for users who put CC= in their make.conf. I'm just going to revert all of work leading up to this and implement the original fix differently. > This allows the CXX hack in r300917 for external GCC to work for > the lib32 build. It is also the same pattern as the native > build uses by adding the tools into CROSSENV for external > toolchain, rather than make overrides. > > Sponsored by: EMC / Isilon Storage Division > > Modified: > head/Makefile.libcompat > > Modified: head/Makefile.libcompat > ============================================================================== > --- head/Makefile.libcompat Sun May 29 01:43:28 2016 (r300925) > +++ head/Makefile.libcompat Sun May 29 01:45:15 2016 (r300926) > @@ -17,7 +17,7 @@ LIB32CPUFLAGS= -march=${TARGET_CPUTYPE} > .endif > LIB32WMAKEENV= MACHINE=i386 MACHINE_ARCH=i386 \ > MACHINE_CPU="i686 mmx sse sse2" > -LIB32WMAKEFLAGS= \ > +LIB32WMAKEENV+= \ > AS="${XAS} --32" \ > LD="${XLD} -m elf_i386_fbsd -Y P,${LIBCOMPATTMP}/usr/lib32" \ > OBJCOPY="${XOBJCOPY}" > @@ -29,7 +29,7 @@ LIB32CPUFLAGS= -mcpu=powerpc > LIB32CPUFLAGS= -mcpu=${TARGET_CPUTYPE} > .endif > LIB32WMAKEENV= MACHINE=powerpc MACHINE_ARCH=powerpc > -LIB32WMAKEFLAGS= \ > +LIB32WMAKEENV+= \ > LD="${XLD} -m elf32ppc_fbsd" \ > OBJCOPY="${XOBJCOPY}" > .endif > @@ -84,9 +84,11 @@ LIBCOMPATWMAKEENV+= MAKEOBJDIRPREFIX=${L > # Don't rebuild build-tools targets during normal build. > LIBCOMPATWMAKEENV+= BUILD_TOOLS_META=.NOMETA_CMP > .endif > -LIBCOMPATWMAKEFLAGS+= CC="${XCC} ${LIBCOMPATCFLAGS}" \ > +LIBCOMPATWMAKEENV+= \ > + CC="${XCC} ${LIBCOMPATCFLAGS}" \ > CXX="${XCXX} ${LIBCOMPATCFLAGS} ${LIBCOMPATCXXFLAGS}" \ > - CPP="${XCPP} ${LIBCOMPATCFLAGS}" \ > + CPP="${XCPP} ${LIBCOMPATCFLAGS}" > +LIBCOMPATWMAKEFLAGS+= \ > DESTDIR=${LIBCOMPATTMP} \ > -DNO_CPU_CFLAGS \ > MK_CTF=no \ > -- Regards, Bryan Drewery
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?73c7c1db-d753-e065-1b51-acc5f3f8c137>