From owner-svn-src-head@freebsd.org Sun May 29 04:30:55 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 05AC7B50132; Sun, 29 May 2016 04:30:55 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id E8C7E1ABB; Sun, 29 May 2016 04:30:54 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [IPv6:::1]) by freefall.freebsd.org (Postfix) with ESMTP id E321B1EC5; Sun, 29 May 2016 04:30:54 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 9DA5A1E869; Sun, 29 May 2016 04:30:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id X3TkpDkohWch; Sun, 29 May 2016 04:30:47 +0000 (UTC) Subject: Re: svn commit: r300926 - head DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com CCBBE1E863 To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201605290145.u4T1jFOX099601@repo.freebsd.org> From: Bryan Drewery Organization: FreeBSD Message-ID: <73c7c1db-d753-e065-1b51-acc5f3f8c137@FreeBSD.org> Date: Sat, 28 May 2016 21:30:45 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:45.0) Gecko/20100101 Thunderbird/45.1.0 MIME-Version: 1.0 In-Reply-To: <201605290145.u4T1jFOX099601@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.22 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: Sun, 29 May 2016 04:30:55 -0000 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