From owner-svn-src-head@FreeBSD.ORG Wed Nov 9 19:00:28 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1CC6C1065674; Wed, 9 Nov 2011 19:00:28 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E832B8FC16; Wed, 9 Nov 2011 19:00:27 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA9J0R1f095597; Wed, 9 Nov 2011 19:00:27 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA9J0Rc0095595; Wed, 9 Nov 2011 19:00:27 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201111091900.pA9J0Rc0095595@svn.freebsd.org> From: Dimitry Andric Date: Wed, 9 Nov 2011 19:00:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227403 - head X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 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: Wed, 09 Nov 2011 19:00:28 -0000 Author: dim Date: Wed Nov 9 19:00:27 2011 New Revision: 227403 URL: http://svn.freebsd.org/changeset/base/227403 Log: Move building of clang's tblgen tools (and required libraries) from the bootstrap-tools stage to the cross-tools stage. These tools are only needed for generating llvm/clang include files, and are not necessary for bootstrapping the build itself. This shaves off some build time, because the required libraries are now just built twice (during the cross-tools and world stages), instead of three times. Also, if you build world using WITHOUT_CLANG= in src.conf(5), no llvm or clang code will be compiled at all anymore. MFC after: 1 week Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Wed Nov 9 18:51:41 2011 (r227402) +++ head/Makefile.inc1 Wed Nov 9 19:00:27 2011 (r227403) @@ -1029,14 +1029,6 @@ _gensnmptree= usr.sbin/bsnmpd/gensnmptre _crunchgen= usr.sbin/crunch/crunchgen .endif -.if ${MK_CLANG} != "no" -_clang_tblgen= \ - lib/clang/libllvmsupport \ - lib/clang/libllvmtablegen \ - usr.bin/clang/tblgen \ - usr.bin/clang/clang-tblgen -.endif - .if ${MK_CDDL} != "no" && \ ${BOOTSTRAPPING} < 800038 && \ !(${BOOTSTRAPPING} >= 700112 && ${BOOTSTRAPPING} < 799999) @@ -1053,7 +1045,6 @@ _dtc= gnu/usr.bin/dtc # FreeBSD versions that need the tool built at this stage of the build. bootstrap-tools: .for _tool in \ - ${_clang_tblgen} \ ${_dtrace_tools} \ ${_strfile} \ ${_gperf} \ @@ -1149,9 +1140,13 @@ _binutils= gnu/usr.bin/binutils .endif .if ${MK_CLANG} != "no" +_clang_tblgen= lib/clang/libllvmsupport \ + lib/clang/libllvmtablegen \ + usr.bin/clang/tblgen \ + usr.bin/clang/clang-tblgen .if ${CC:T:Mclang} == "clang" -_clang= usr.bin/clang _clang_libs= lib/clang +_clang= usr.bin/clang .endif .endif @@ -1161,6 +1156,7 @@ _cc= gnu/usr.bin/cc cross-tools: .for _tool in \ + ${_clang_tblgen} \ ${_clang_libs} \ ${_clang} \ ${_binutils} \