From owner-svn-src-head@FreeBSD.ORG Fri Sep 6 20:11:45 2013 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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 226B25CA; Fri, 6 Sep 2013 20:11:45 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from anacreon.physics.wisc.edu (unknown [IPv6:2607:f388:101c:0:216:cbff:fe39:3fae]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DFCB52167; Fri, 6 Sep 2013 20:11:44 +0000 (UTC) Received: from anacreon.physics.wisc.edu (localhost [IPv6:::1]) by anacreon.physics.wisc.edu (8.14.7/8.14.7) with ESMTP id r86KBhDm003871; Fri, 6 Sep 2013 15:11:43 -0500 (CDT) (envelope-from nwhitehorn@freebsd.org) Message-ID: <522A36FF.6050209@freebsd.org> Date: Fri, 06 Sep 2013 15:11:43 -0500 From: Nathan Whitehorn User-Agent: Mozilla/5.0 (X11; FreeBSD powerpc; rv:17.0) Gecko/20130402 Thunderbird/17.0.4 MIME-Version: 1.0 To: David Chisnall Subject: Re: svn commit: r255321 - in head: contrib/llvm/tools/clang/lib/Driver gnu/lib gnu/usr.bin/cc share/mk sys/sys tools/build/options References: <201309062008.r86K836C048843@svn.freebsd.org> In-Reply-To: <201309062008.r86K836C048843@svn.freebsd.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 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: Fri, 06 Sep 2013 20:11:45 -0000 On 09/06/13 15:08, David Chisnall wrote: > Author: theraven > Date: Fri Sep 6 20:08:03 2013 > New Revision: 255321 > URL: http://svnweb.freebsd.org/changeset/base/255321 > > Log: > On platforms where clang is the default compiler, don't build gcc or libstdc++. > To enable them, set WITH_GCC and WITH_GNUCXX in src.conf. > Make clang default to using libc++ on FreeBSD 10. > Bumped __FreeBSD_version for the change. > . > > Modified: head/share/mk/bsd.own.mk > ============================================================================== > --- head/share/mk/bsd.own.mk Fri Sep 6 18:41:57 2013 (r255320) > +++ head/share/mk/bsd.own.mk Fri Sep 6 20:08:03 2013 (r255321) > @@ -284,7 +284,6 @@ __DEFAULT_YES_OPTIONS = \ > FP_LIBC \ > FREEBSD_UPDATE \ > GAMES \ > - GCC \ > GCOV \ > GDB \ > GNU \ > @@ -400,6 +399,11 @@ __T=${TARGET_ARCH} > .else > __T=${MACHINE_ARCH} > .endif > +.if defined(TARGET) > +__TT=${TARGET} > +.else > +__TT=${MACHINE_ARCH} > +.endif Don't you mean MACHINE here? Otherwise native builds on pc98 will fail due to: > +# The pc98 bootloader requires gcc to build and so we must leave gcc enabled > +# for pc98 for now. > +.if ${__TT} == "pc98" > +__DEFAULT_NO_OPTIONS+=GNUCXX > +__DEFAULT_YES_OPTIONS+=GCC > +.else > +__DEFAULT_NO_OPTIONS+=GCC GNUCXX > +.endif > this section, where __TT will be "i386" when built natively on pc98 systems. -Nathan