Author: bdrewery
Date: Sat Jun 30 19:36:02 2018
New Revision: 335823
URL: https://svnweb.freebsd.org/changeset/base/335823

Log:
  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

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1  Sat Jun 30 18:18:41 2018        (r335822)
+++ head/Makefile.inc1  Sat Jun 30 19:36:02 2018        (r335823)
@@ -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" \
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to