From 2e90942fa63003849aff76aef7b8629840706bcb Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Sat, 30 Jun 2018 19:36:02 +0000 Subject: [PATCH] META_MODE: Fix clang-tblgen flip-flop building after r335707. The build of this would have MK_LLVM_TARGET_ALL=yes for bootstrap-tools but MK_LLVM_TARGET_ALL=no for cross-tools and thus would rebuild between the two. MFC after: 2 weeks X-MFC-with: r335707 Sponsored by: Dell EMC --- Makefile.inc1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 15627d4bafaa..420c058aa3a6 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -666,6 +666,9 @@ BSARGS= DESTDIR= \ BMAKE= \ ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \ ${BSARGS} +.if empty(.MAKEOVERRIDES:MMK_LLVM_TARGET_ALL) +BMAKE+= MK_LLVM_TARGET_ALL=no +.endif # build-tools stage TMAKE= \ @@ -685,9 +688,6 @@ TMAKE= \ XMAKE= ${BMAKE} \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ MK_GDB=no MK_TESTS=no -.if empty(.MAKEOVERRIDES:MMK_LLVM_TARGET_ALL) -XMAKE+= MK_LLVM_TARGET_ALL=no -.endif # kernel-tools stage KTMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \