svn commit: r291546 - head/targets/pseudo/bootstrap-tools

Bryan Drewery bdrewery at FreeBSD.org
Tue Dec 1 00:32:10 UTC 2015


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


More information about the svn-src-head mailing list