From owner-svn-src-head@freebsd.org Tue Dec 1 00:32:10 2015 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 B4D90A3A402; Tue, 1 Dec 2015 00:32:10 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7AF6118C9; Tue, 1 Dec 2015 00:32:10 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB10W9YK024416; Tue, 1 Dec 2015 00:32:09 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB10W9eM024415; Tue, 1 Dec 2015 00:32:09 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201512010032.tB10W9eM024415@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 1 Dec 2015 00:32:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r291546 - head/targets/pseudo/bootstrap-tools X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Tue, 01 Dec 2015 00:32:10 -0000 Author: bdrewery Date: Tue Dec 1 00:32:09 2015 New Revision: 291546 URL: https://svnweb.freebsd.org/changeset/base/291546 Log: META MODE: For bootstrap-tools, don't let Makefile.inc1 build any of the toolchain. This change prevents building of [clang-]tblgen, which is unneeded due to already being a host dependency where needed for targets/pseudo/toolchain. Sponsored by: EMC / Isilon Storage Division Modified: head/targets/pseudo/bootstrap-tools/Makefile Modified: head/targets/pseudo/bootstrap-tools/Makefile ============================================================================== --- head/targets/pseudo/bootstrap-tools/Makefile Tue Dec 1 00:24:54 2015 (r291545) +++ head/targets/pseudo/bootstrap-tools/Makefile Tue Dec 1 00:32:09 2015 (r291546) @@ -45,6 +45,8 @@ BSARGS= DESTDIR= \ # Need to override these so OBJTOP uses are proper in the non-meta build. BSARGS+= OBJTOP=${BTOOLSDIR}${SRCTOP} OBJROOT='$${OBJTOP}/' +# We will handle building the toolchain and cross-compiler. +BSARGS+= MK_CROSS_COMPILER=no MK_CLANG=no MK_GCC=no DISTRIB_ENV= INSTALL="sh ${SRCTOP}/tools/install.sh" NO_FSCHG=1 MK_TESTS=no legacy: .MAKE .META @@ -75,7 +77,7 @@ BSTCENV= \ TARGET_ARCH=${HOST_MACHINE_ARCH} BSTCARGS= \ - ${BSARGS:NDESTDIR=*:NOBJTOP=*:NOBJROOT=*} \ + ${BSARGS:NDESTDIR=*:NOBJTOP=*:NOBJROOT=*:NMK_CROSS_COMPILER=*:NMK_CLANG=*:NMK_GCC=*} \ BUILD_DIRDEPS=yes \ -DWITH_STAGING \ -DWITH_TOOLSDIR