svn commit: r335448 - in head: . lib/clang/libllvm

[Bryan Drewery]

Author: bdrewery
Date: Wed Jun 20 16:10:07 2018
New Revision: 335448
URL: https://svnweb.freebsd.org/changeset/base/335448

Log:
  Rework WITHOUT_LLD/TOOLCHAIN fix from r327892 for cross-tools.
  
  MK_LLD is for the installed lld while MK_LLD_BOOTSTRAP is for the build
  tool.  For WITH_SYSTEM_LINKER it is necesarry to separate the logic of
  these two.  When building libllvm TOOLS_PREFIX will be defined and
  MK_LLD_BOOTSTRAP should be checked instead.
  
  Sponsored by:	Dell EMC
  Differential Revision:	https://reviews.freebsd.org/D15837

Modified:
  head/Makefile.inc1
  head/lib/clang/libllvm/Makefile

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Wed Jun 20 16:10:02 2018	(r335447)
+++ head/Makefile.inc1	Wed Jun 20 16:10:07 2018	(r335448)
@@ -562,7 +562,6 @@ BSARGS= 	DESTDIR= \
 		-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
 		MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \
 		MK_LLDB=no MK_TESTS=no \
-		MK_LLD=${MK_LLD_BOOTSTRAP} \
 		MK_INCLUDES=yes
 
 BMAKE=		\

Modified: head/lib/clang/libllvm/Makefile
==============================================================================
--- head/lib/clang/libllvm/Makefile	Wed Jun 20 16:10:02 2018	(r335447)
+++ head/lib/clang/libllvm/Makefile	Wed Jun 20 16:10:07 2018	(r335448)
@@ -1284,16 +1284,19 @@ SRCS_ALL+=	${SRCS_EXT}
 .if ${MK_CLANG_FULL} != "no"
 SRCS_ALL+=	${SRCS_FUL}
 .endif
-.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLD} != "no"
+.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLD} != "no" || \
+    (defined(TOOLS_PREFIX) && ${MK_LLD_BOOTSTRAP} != "no")
 SRCS_ALL+=	${SRCS_EXL}
 .endif
-.if ${MK_LLD} != "no"
+.if ${MK_LLD} != "no" || \
+    (defined(TOOLS_PREFIX) && ${MK_LLD_BOOTSTRAP} != "no")
 SRCS_ALL+=	${SRCS_LLD}
 .endif
 .if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no"
 SRCS_ALL+=	${SRCS_XDB}
 .endif
-.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no" || ${MK_LLD} != "no"
+.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no" || ${MK_LLD} != "no" || \
+    (defined(TOOLS_PREFIX) && ${MK_LLD_BOOTSTRAP} != "no")
 SRCS_ALL+=	${SRCS_XDL}
 .endif
 .if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no" || !defined(TOOLS_PREFIX)