From 6ca6c445fd33904301d68927dae7014145b99e7b Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Tue, 1 Dec 2015 00:32:09 +0000 Subject: [PATCH] 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 --- targets/pseudo/bootstrap-tools/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/targets/pseudo/bootstrap-tools/Makefile b/targets/pseudo/bootstrap-tools/Makefile index 8b4c7629698..30a5b894ecd 100644 --- a/targets/pseudo/bootstrap-tools/Makefile +++ b/targets/pseudo/bootstrap-tools/Makefile @@ -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